mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 00:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

make channel_id private, use getChannelID()

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c624505818
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-29 (Thu, 29 Jan 2015)

Origin message was:
------------------
 make channel_id private, use getChannelID()

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2015-01-29 14:58:09 +01:00
parent 289a84fa45
commit e9483cd66e
9 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/bedit/bouqueteditor_channels.cpp
View File

@@ -456,7 +456,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
if (state == beDefault) if (state == beDefault)
{ {
if (selected < Channels->size()) /* Channels.size() might be 0 */ if (selected < Channels->size()) /* Channels.size() might be 0 */
g_Zapit->zapTo_serviceID((*Channels)[selected]->channel_id); g_Zapit->zapTo_serviceID((*Channels)[selected]->getChannelID());
} else if (state == beMoving) { } else if (state == beMoving) {
finishMoveChannel(); finishMoveChannel();
@@ -495,7 +495,7 @@ void CBEChannelWidget::deleteChannel()
if (ShowMsg(LOCALE_FILEBROWSER_DELETE, (*Channels)[selected]->getName(), CMessageBox::mbrNo, CMessageBox::mbYes|CMessageBox::mbNo)!=CMessageBox::mbrYes) if (ShowMsg(LOCALE_FILEBROWSER_DELETE, (*Channels)[selected]->getName(), CMessageBox::mbrNo, CMessageBox::mbYes|CMessageBox::mbNo)!=CMessageBox::mbrYes)
return; return;
g_bouquetManager->Bouquets[bouquet]->removeService((*Channels)[selected]->channel_id); g_bouquetManager->Bouquets[bouquet]->removeService((*Channels)[selected]->getChannelID());
Channels = mode == CZapitClient::MODE_TV ? &(g_bouquetManager->Bouquets[bouquet]->tvChannels) : &(g_bouquetManager->Bouquets[bouquet]->radioChannels); Channels = mode == CZapitClient::MODE_TV ? &(g_bouquetManager->Bouquets[bouquet]->tvChannels) : &(g_bouquetManager->Bouquets[bouquet]->radioChannels);

2
src/gui/bedit/bouqueteditor_chanselect.cpp
View File

@@ -92,7 +92,7 @@ bool CBEChannelSelectWidget::isChannelInBouquet( int index)
{ {
for (unsigned int i=0; i< bouquetChannels->size(); i++) for (unsigned int i=0; i< bouquetChannels->size(); i++)
{ {
if ((*bouquetChannels)[i]->channel_id == Channels[index]->channel_id) if ((*bouquetChannels)[i]->getChannelID() == Channels[index]->getChannelID())
return true; return true;
} }
return false; return false;

20
src/gui/epgplus.cpp
View File

@@ -549,9 +549,9 @@ void EpgPlus::createChannelEntries (int selectedChannelEntryIndex)
CZapitChannel * channel = (*this->channelList)[i]; CZapitChannel * channel = (*this->channelList)[i];
ChannelEntry *channelEntry = new ChannelEntry (channel, i, this->frameBuffer, this->footer, this->bouquetList, this->channelsTableX + 2, yPosChannelEntry, this->channelsTableWidth); ChannelEntry *channelEntry = new ChannelEntry (channel, i, this->frameBuffer, this->footer, this->bouquetList, this->channelsTableX + 2, yPosChannelEntry, this->channelsTableWidth);
//printf("Going to get getEventsServiceKey for %llx\n", (channel->channel_id & 0xFFFFFFFFFFFFULL)); //printf("Going to get getEventsServiceKey for %llx\n", (channel->getChannelID() & 0xFFFFFFFFFFFFULL));
CChannelEventList channelEventList; CChannelEventList channelEventList;
CEitManager::getInstance()->getEventsServiceKey(channel->channel_id, channelEventList); CEitManager::getInstance()->getEventsServiceKey(channel->getChannelID(), channelEventList);
//printf("channelEventList size %d\n", channelEventList.size()); //printf("channelEventList size %d\n", channelEventList.size());
int xPosEventEntry = this->eventsTableX; int xPosEventEntry = this->eventsTableX;
@@ -562,13 +562,13 @@ void EpgPlus::createChannelEntries (int selectedChannelEntryIndex)
//for (CChannelEventList::const_iterator It = channelEventList.begin(); (It != channelEventList.end()) && (It->startTime < (this->startTime + this->duration)); ++It) //for (CChannelEventList::const_iterator It = channelEventList.begin(); (It != channelEventList.end()) && (It->startTime < (this->startTime + this->duration)); ++It)
for (CChannelEventList::const_iterator It = channelEventList.begin(); It != channelEventList.end(); ++It) for (CChannelEventList::const_iterator It = channelEventList.begin(); It != channelEventList.end(); ++It)
{ {
//if(0x2bc000b004b7ULL == (channel->channel_id & 0xFFFFFFFFFFFFULL)) printf("*** Check1 event %s event start %ld this start %ld\n", It->description.c_str(), It->startTime, (this->startTime + this->duration)); //if(0x2bc000b004b7ULL == (channel->getChannelID() & 0xFFFFFFFFFFFFULL)) printf("*** Check1 event %s event start %ld this start %ld\n", It->description.c_str(), It->startTime, (this->startTime + this->duration));
if (!(It->startTime < (this->startTime + this->duration)) ) if (!(It->startTime < (this->startTime + this->duration)) )
continue; continue;
if ((lastIt == channelEventList.end()) || (lastIt->startTime != It->startTime)) { if ((lastIt == channelEventList.end()) || (lastIt->startTime != It->startTime)) {
int startTimeDiff = It->startTime - this->startTime; int startTimeDiff = It->startTime - this->startTime;
int endTimeDiff = this->startTime + time_t (this->duration) - It->startTime - time_t (It->duration); int endTimeDiff = this->startTime + time_t (this->duration) - It->startTime - time_t (It->duration);
//if(0x2bc000b004b7ULL == (channel->channel_id & 0xFFFFFFFFFFFFULL)) printf("*** Check event %s\n", It->description.c_str()); //if(0x2bc000b004b7ULL == (channel->getChannelID() & 0xFFFFFFFFFFFFULL)) printf("*** Check event %s\n", It->description.c_str());
if ((startTimeDiff >= 0) && (endTimeDiff >= 0)) { if ((startTimeDiff >= 0) && (endTimeDiff >= 0)) {
// channel event fits completely in the visible part of time line // channel event fits completely in the visible part of time line
startTimeDiff = 0; startTimeDiff = 0;
@@ -582,10 +582,10 @@ void EpgPlus::createChannelEntries (int selectedChannelEntryIndex)
// channel event ends after visible part of the time line but starts in the visible part // channel event ends after visible part of the time line but starts in the visible part
startTimeDiff = 0; startTimeDiff = 0;
} else if (startTimeDiff > 0) { // channel event starts and ends after visible part of the time line => break the loop } else if (startTimeDiff > 0) { // channel event starts and ends after visible part of the time line => break the loop
//if(0x2bc000b004b7ULL == (channel->channel_id & 0xFFFFFFFFFFFFULL)) printf("*** break 1\n"); //if(0x2bc000b004b7ULL == (channel->getChannelID() & 0xFFFFFFFFFFFFULL)) printf("*** break 1\n");
break; break;
} else { // channel event starts and ends after visible part of the time line => ignore the channel event } else { // channel event starts and ends after visible part of the time line => ignore the channel event
//if(0x2bc000b004b7ULL == (channel->channel_id & 0xFFFFFFFFFFFFULL)) printf("*** continue 1 startTimeDiff %ld endTimeDiff %ld\n", startTimeDiff, endTimeDiff); //if(0x2bc000b004b7ULL == (channel->getChannelID() & 0xFFFFFFFFFFFFULL)) printf("*** continue 1 startTimeDiff %ld endTimeDiff %ld\n", startTimeDiff, endTimeDiff);
continue; continue;
} }
@@ -926,7 +926,7 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
} }
else if (msg == CRCInput::RC_ok) { else if (msg == CRCInput::RC_ok) {
if (selectedChannelEntry) if (selectedChannelEntry)
CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(selectedChannelEntry->channel->channel_id); CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(selectedChannelEntry->channel->getChannelID());
current_bouquet = bouquetList->getActiveBouquetNumber(); current_bouquet = bouquetList->getActiveBouquetNumber();
} }
else if (CRCInput::isNumeric (msg)) { else if (CRCInput::isNumeric (msg)) {
@@ -1109,7 +1109,7 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
this->hide(); this->hide();
time_t startTime2 = (*It)->channelEvent.startTime; time_t startTime2 = (*It)->channelEvent.startTime;
res = g_EpgData->show (this->selectedChannelEntry->channel->channel_id, (*It)->channelEvent.eventID, &startTime2); res = g_EpgData->show (this->selectedChannelEntry->channel->getChannelID(), (*It)->channelEvent.eventID, &startTime2);
if (res == menu_return::RETURN_EXIT_ALL) { if (res == menu_return::RETURN_EXIT_ALL) {
loop = false; loop = false;
@@ -1286,7 +1286,7 @@ int EpgPlus::MenuTargetAddReminder::exec (CMenuTarget * /*parent*/, const std::s
&& (!(*It)->channelEvent.description.empty()) && (!(*It)->channelEvent.description.empty())
) { ) {
if (g_Timerd->isTimerdAvailable()) { if (g_Timerd->isTimerdAvailable()) {
g_Timerd->addZaptoTimerEvent (this->epgPlus->selectedChannelEntry->channel->channel_id, (*It)->channelEvent.startTime - (g_settings.zapto_pre_time * 60), (*It)->channelEvent.startTime - ANNOUNCETIME - (g_settings.zapto_pre_time * 60), 0, (*It)->channelEvent.eventID, (*It)->channelEvent.startTime, 0); g_Timerd->addZaptoTimerEvent (this->epgPlus->selectedChannelEntry->channel->getChannelID(), (*It)->channelEvent.startTime - (g_settings.zapto_pre_time * 60), (*It)->channelEvent.startTime - ANNOUNCETIME - (g_settings.zapto_pre_time * 60), 0, (*It)->channelEvent.eventID, (*It)->channelEvent.startTime, 0);
ShowMsg (LOCALE_TIMER_EVENTTIMED_TITLE, g_Locale->getText (LOCALE_TIMER_EVENTTIMED_MSG) ShowMsg (LOCALE_TIMER_EVENTTIMED_TITLE, g_Locale->getText (LOCALE_TIMER_EVENTTIMED_MSG)
, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); // UTF-8 , CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); // UTF-8
@@ -1309,7 +1309,7 @@ int EpgPlus::MenuTargetAddRecordTimer::exec (CMenuTarget * /*parent*/, const std
) { ) {
if (g_Timerd->isTimerdAvailable()) { if (g_Timerd->isTimerdAvailable()) {
g_Timerd->addRecordTimerEvent (this->epgPlus->selectedChannelEntry->channel->channel_id, (*It)->channelEvent.startTime, (*It)->channelEvent.startTime + (*It)->channelEvent.duration, (*It)->channelEvent.eventID, (*It)->channelEvent.startTime, (*It)->channelEvent.startTime - (ANNOUNCETIME + 120) g_Timerd->addRecordTimerEvent (this->epgPlus->selectedChannelEntry->channel->getChannelID(), (*It)->channelEvent.startTime, (*It)->channelEvent.startTime + (*It)->channelEvent.duration, (*It)->channelEvent.eventID, (*It)->channelEvent.startTime, (*It)->channelEvent.startTime - (ANNOUNCETIME + 120)
, TIMERD_APIDS_CONF, true); , TIMERD_APIDS_CONF, true);
ShowMsg (LOCALE_TIMER_EVENTRECORD_TITLE, g_Locale->getText (LOCALE_TIMER_EVENTRECORD_MSG) ShowMsg (LOCALE_TIMER_EVENTRECORD_TITLE, g_Locale->getText (LOCALE_TIMER_EVENTRECORD_MSG)
, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); // UTF-8 , CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); // UTF-8

12
src/gui/eventlist.cpp
View File

@@ -566,22 +566,22 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c
unsigned int tmp_channel = 0; unsigned int tmp_channel = 0;
for(unsigned int channel = 0; channel < channel_nr; channel++) for(unsigned int channel = 0; channel < channel_nr; channel++)
{ {
channel_id_tmp = bouquetList->Bouquets[current_bouquet_id]->channelList->getChannelFromIndex(channel)->channel_id; channel_id_tmp = bouquetList->Bouquets[current_bouquet_id]->channelList->getChannelFromIndex(channel)->getChannelID();
if(channel_id_tmp == channel_id){ if(channel_id_tmp == channel_id){
if ( msg==CRCInput::RC_right || msg==CRCInput::RC_forward ) { if ( msg==CRCInput::RC_right || msg==CRCInput::RC_forward ) {
channel = (channel+1) %channel_nr; channel = (channel+1) %channel_nr;
}else { //RC_rewind }else { //RC_rewind
channel = (channel == 0) ? channel_nr -1 : channel - 1; channel = (channel == 0) ? channel_nr -1 : channel - 1;
} }
_channel_id = bouquetList->Bouquets[current_bouquet_id]->channelList->getChannelFromIndex(channel)->channel_id; _channel_id = bouquetList->Bouquets[current_bouquet_id]->channelList->getChannelFromIndex(channel)->getChannelID();
current_channel_name = CServiceManager::getInstance()->GetServiceName(_channel_id); current_channel_name = CServiceManager::getInstance()->GetServiceName(_channel_id);
tmp_channel = (channel == 0) ? channel_nr - 1 : channel - 1; tmp_channel = (channel == 0) ? channel_nr - 1 : channel - 1;
channel_id_tmp = bouquetList->Bouquets[current_bouquet_id]->channelList->getChannelFromIndex(tmp_channel)->channel_id; channel_id_tmp = bouquetList->Bouquets[current_bouquet_id]->channelList->getChannelFromIndex(tmp_channel)->getChannelID();
prev_channel_name = CServiceManager::getInstance()->GetServiceName(channel_id_tmp); prev_channel_name = CServiceManager::getInstance()->GetServiceName(channel_id_tmp);
tmp_channel = (channel+1) %channel_nr; tmp_channel = (channel+1) %channel_nr;
channel_id_tmp = bouquetList->Bouquets[current_bouquet_id]->channelList->getChannelFromIndex(tmp_channel)->channel_id; channel_id_tmp = bouquetList->Bouquets[current_bouquet_id]->channelList->getChannelFromIndex(tmp_channel)->getChannelID();
next_channel_name = CServiceManager::getInstance()->GetServiceName(channel_id_tmp); next_channel_name = CServiceManager::getInstance()->GetServiceName(channel_id_tmp);
break; break;
} }
@@ -1077,7 +1077,7 @@ bool CNeutrinoEventList::findEvents(void)
int channel_nr = bouquetList->Bouquets[m_search_bouquet_id]->channelList->getSize(); int channel_nr = bouquetList->Bouquets[m_search_bouquet_id]->channelList->getSize();
for(int channel = 0; channel < channel_nr; channel++) for(int channel = 0; channel < channel_nr; channel++)
{ {
channel_id = bouquetList->Bouquets[m_search_bouquet_id]->channelList->getChannelFromIndex(channel)->channel_id; channel_id = bouquetList->Bouquets[m_search_bouquet_id]->channelList->getChannelFromIndex(channel)->getChannelID();
CEitManager::getInstance()->getEventsServiceKey(channel_id, evtlist, m_search_epg_item,m_search_keyword); CEitManager::getInstance()->getEventsServiceKey(channel_id, evtlist, m_search_epg_item,m_search_keyword);
} }
} }
@@ -1089,7 +1089,7 @@ bool CNeutrinoEventList::findEvents(void)
std::vector<t_channel_id> v; std::vector<t_channel_id> v;
int channel_nr = CNeutrinoApp::getInstance ()->channelList->getSize();//unique channelList TV or Radio int channel_nr = CNeutrinoApp::getInstance ()->channelList->getSize();//unique channelList TV or Radio
for(int channel = 0; channel < channel_nr; channel++){ for(int channel = 0; channel < channel_nr; channel++){
channel_id = CNeutrinoApp::getInstance ()->channelList->getChannelFromIndex(channel)->channel_id; channel_id = CNeutrinoApp::getInstance ()->channelList->getChannelFromIndex(channel)->getChannelID();
v.push_back(channel_id); v.push_back(channel_id);
} }

4
src/gui/timerlist.cpp
View File

@@ -1194,7 +1194,7 @@ int CTimerList::newTimer()
g_bouquetManager->Bouquets[i]->getTvChannels(channels); g_bouquetManager->Bouquets[i]->getTvChannels(channels);
for (int j = 0; j < (int) channels.size(); j++) { for (int j = 0; j < (int) channels.size(); j++) {
char cChannelId[3+16+1+1]; char cChannelId[3+16+1+1];
sprintf(cChannelId, "SC:" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS ",", channels[j]->channel_id); sprintf(cChannelId, "SC:" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS ",", channels[j]->getChannelID());
mwtv->addItem(new CMenuForwarder(channels[j]->getName(), true, NULL, this, (std::string(cChannelId) + channels[j]->getName()).c_str(), CRCInput::RC_nokey, NULL, channels[j]->scrambled ? NEUTRINO_ICON_SCRAMBLED : (channels[j]->getUrl().empty() ? NULL : NEUTRINO_ICON_STREAMING))); mwtv->addItem(new CMenuForwarder(channels[j]->getName(), true, NULL, this, (std::string(cChannelId) + channels[j]->getName()).c_str(), CRCInput::RC_nokey, NULL, channels[j]->scrambled ? NEUTRINO_ICON_SCRAMBLED : (channels[j]->getUrl().empty() ? NULL : NEUTRINO_ICON_STREAMING)));
} }
@@ -1205,7 +1205,7 @@ int CTimerList::newTimer()
g_bouquetManager->Bouquets[i]->getRadioChannels(channels); g_bouquetManager->Bouquets[i]->getRadioChannels(channels);
for (int j = 0; j < (int) channels.size(); j++) { for (int j = 0; j < (int) channels.size(); j++) {
char cChannelId[3+16+1+1]; char cChannelId[3+16+1+1];
sprintf(cChannelId, "SC:" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS ",", channels[j]->channel_id); sprintf(cChannelId, "SC:" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS ",", channels[j]->getChannelID());
mwradio->addItem(new CMenuForwarder(channels[j]->getName(), true, NULL, this, (std::string(cChannelId) + channels[j]->getName()).c_str(), CRCInput::RC_nokey, NULL, channels[j]->scrambled ? NEUTRINO_ICON_SCRAMBLED : (channels[j]->getUrl().empty() ? NULL : NEUTRINO_ICON_STREAMING))); mwradio->addItem(new CMenuForwarder(channels[j]->getName(), true, NULL, this, (std::string(cChannelId) + channels[j]->getName()).c_str(), CRCInput::RC_nokey, NULL, channels[j]->scrambled ? NEUTRINO_ICON_SCRAMBLED : (channels[j]->getUrl().empty() ? NULL : NEUTRINO_ICON_STREAMING)));
} }
if (!channels.empty()) if (!channels.empty())

2
src/gui/zapit_setup.cpp
View File

@@ -176,7 +176,7 @@ int CSelectChannelWidget::InitZapitChannelHelper(CZapitClient::channelsMode mode
for(int j = 0; j < (int) channels.size(); j++) { for(int j = 0; j < (int) channels.size(); j++) {
CZapitChannel * channel = channels[j]; CZapitChannel * channel = channels[j];
char cChannelId[60] = {0}; char cChannelId[60] = {0};
snprintf(cChannelId, sizeof(cChannelId), "ZC%c:%d|%" PRIx64 "#", (mode==CZapitClient::MODE_TV)?'T':'R', channel->number, channel->channel_id); snprintf(cChannelId, sizeof(cChannelId), "ZC%c:%d|%" PRIx64 "#", (mode==CZapitClient::MODE_TV)?'T':'R', channel->number, channel->getChannelID());
CMenuForwarder * chan_item = new CMenuForwarder(channel->getName(), true, NULL, this, CMenuForwarder * chan_item = new CMenuForwarder(channel->getName(), true, NULL, this,
(std::string(cChannelId) + channel->getName()).c_str(), CRCInput::RC_nokey, NULL, (std::string(cChannelId) + channel->getName()).c_str(), CRCInput::RC_nokey, NULL,

36
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -830,13 +830,13 @@ std::string CControlAPI::_GetBouquetActualEPGItem(CyhookHandler *hh, CZapitChann
CSectionsdClient::responseGetCurrentNextInfoChannelID currentNextInfo; CSectionsdClient::responseGetCurrentNextInfoChannelID currentNextInfo;
CChannelEvent *event; CChannelEvent *event;
event = NeutrinoAPI->ChannelListEvents[channel->channel_id]; event = NeutrinoAPI->ChannelListEvents[channel->getChannelID()];
if (event) { if (event) {
int percentage = 100; int percentage = 100;
if (event->duration > 0) if (event->duration > 0)
percentage = 100 * (time(NULL) - event->startTime) / event->duration; percentage = 100 * (time(NULL) - event->startTime) / event->duration;
CEitManager::getInstance()->getCurrentNextServiceKey(channel->channel_id, currentNextInfo); CEitManager::getInstance()->getCurrentNextServiceKey(channel->getChannelID(), currentNextInfo);
timestr = timeString(event->startTime); timestr = timeString(event->startTime);
firstEPG += hh->outPair("startTime", timestr, true); firstEPG += hh->outPair("startTime", timestr, true);
@@ -855,7 +855,7 @@ std::string CControlAPI::_GetBouquetActualEPGItem(CyhookHandler *hh, CZapitChann
} }
} }
result += hh->outPair("isActiveChannel", (channel->channel_id == current_channel) ? "true" : "false", (!firstEPG.empty())); result += hh->outPair("isActiveChannel", (channel->getChannelID() == current_channel) ? "true" : "false", (!firstEPG.empty()));
if(!firstEPG.empty()) { if(!firstEPG.empty()) {
result += hh->outCollection("firstEPG", firstEPG); result += hh->outCollection("firstEPG", firstEPG);
} }
@@ -873,10 +873,10 @@ std::string CControlAPI::_GetBouquetWriteItem(CyhookHandler *hh, CZapitChannel *
bool isEPGdetails = !(hh->ParamList["epg"].empty()); bool isEPGdetails = !(hh->ParamList["epg"].empty());
if (hh->outType == json || hh->outType == xml) { if (hh->outType == json || hh->outType == xml) {
result += hh->outPair("number", string_printf("%u", nr), true); result += hh->outPair("number", string_printf("%u", nr), true);
result += hh->outPair("id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->channel_id), true); result += hh->outPair("id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID()), true);
result += hh->outPair("short_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->channel_id&0xFFFFFFFFFFFFULL), true); result += hh->outPair("short_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID()&0xFFFFFFFFFFFFULL), true);
result += hh->outPair("name", hh->outValue(channel->getName()), true); result += hh->outPair("name", hh->outValue(channel->getName()), true);
result += hh->outPair("logo", hh->outValue(NeutrinoAPI->getLogoFile(hh->WebserverConfigList["Tuxbox.LogosURL"], channel->channel_id)), true); result += hh->outPair("logo", hh->outValue(NeutrinoAPI->getLogoFile(hh->WebserverConfigList["Tuxbox.LogosURL"], channel->getChannelID())), true);
result += hh->outPair("bouquetnr", string_printf("%d", bouquetNr), isEPGdetails); result += hh->outPair("bouquetnr", string_printf("%d", bouquetNr), isEPGdetails);
if(isEPGdetails) if(isEPGdetails)
result += _GetBouquetActualEPGItem(hh, channel); result += _GetBouquetActualEPGItem(hh, channel);
@@ -884,21 +884,21 @@ std::string CControlAPI::_GetBouquetWriteItem(CyhookHandler *hh, CZapitChannel *
} }
else { else {
CChannelEvent *event; CChannelEvent *event;
event = NeutrinoAPI->ChannelListEvents[channel->channel_id]; event = NeutrinoAPI->ChannelListEvents[channel->getChannelID()];
if (event && isEPGdetails) { if (event && isEPGdetails) {
result += string_printf("%u " result += string_printf("%u "
PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
" %s (%s)\n", " %s (%s)\n",
nr, nr,
channel->channel_id, channel->getChannelID(),
channel->getName().c_str(), event->description.c_str()); channel->getName().c_str(), event->description.c_str());
} else { } else {
result += string_printf("%u " result += string_printf("%u "
PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
" %s\n", " %s\n",
nr, nr,
channel->channel_id, channel->getChannelID(),
channel->getName().c_str()); channel->getName().c_str());
} }
} }
@@ -1294,7 +1294,7 @@ void CControlAPI::epgDetailList(CyhookHandler *hh) {
for (int j = 0, csize = (int) channels.size(); j < csize; j++) { for (int j = 0, csize = (int) channels.size(); j < csize; j++) {
CZapitChannel * channel = channels[j]; CZapitChannel * channel = channels[j];
res_channels += hh->outArrayItem("channel", channelEPGformated(hh, j + 1, channel->channel_id, max, stoptime), j<csize-1); res_channels += hh->outArrayItem("channel", channelEPGformated(hh, j + 1, channel->getChannelID(), max, stoptime), j<csize-1);
} }
if(all_bouquets) { if(all_bouquets) {
res_channels = hh->outPair("number", string_printf("%d", i + 1), true) + res_channels = hh->outPair("number", string_printf("%d", i + 1), true) +
@@ -1355,7 +1355,7 @@ void CControlAPI::EpgSearchCGI(CyhookHandler *hh, bool xml_forat )
std::vector<t_channel_id> v; std::vector<t_channel_id> v;
int channel_nr = CNeutrinoApp::getInstance ()->channelList->getSize();//unique channelList TV or Radio int channel_nr = CNeutrinoApp::getInstance ()->channelList->getSize();//unique channelList TV or Radio
for(int channel = 0; channel < channel_nr; channel++){ for(int channel = 0; channel < channel_nr; channel++){
channel_id = CNeutrinoApp::getInstance ()->channelList->getChannelFromIndex(channel)->channel_id; channel_id = CNeutrinoApp::getInstance ()->channelList->getChannelFromIndex(channel)->getChannelID();
v.push_back(channel_id); v.push_back(channel_id);
} }
std::map<t_channel_id, t_channel_id> ch_id_map; std::map<t_channel_id, t_channel_id> ch_id_map;
@@ -1491,15 +1491,15 @@ void CControlAPI::EpgCGI(CyhookHandler *hh) {
CBouquetManager::ChannelIterator cit = mode == CZapitClient::MODE_RADIO ? g_bouquetManager->radioChannelsBegin() : g_bouquetManager->tvChannelsBegin(); CBouquetManager::ChannelIterator cit = mode == CZapitClient::MODE_RADIO ? g_bouquetManager->radioChannelsBegin() : g_bouquetManager->tvChannelsBegin();
for (; !(cit.EndOfChannels()); cit++) { for (; !(cit.EndOfChannels()); cit++) {
CZapitChannel * channel = *cit; CZapitChannel * channel = *cit;
event = NeutrinoAPI->ChannelListEvents[channel->channel_id]; event = NeutrinoAPI->ChannelListEvents[channel->getChannelID()];
if (event) { if (event) {
if (!isExt) { if (!isExt) {
hh->printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS hh->printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
" %llu %s\n", channel->channel_id, event->eventID, event->description.c_str()); " %llu %s\n", channel->getChannelID(), event->eventID, event->description.c_str());
} }
else { // ext output else { // ext output
hh->printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS hh->printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
" %ld %u %llu %s\n", channel->channel_id, event->startTime, event->duration, event->eventID, event->description.c_str()); " %ld %u %llu %s\n", channel->getChannelID(), event->startTime, event->duration, event->eventID, event->description.c_str());
} }
} }
} }
@@ -1765,14 +1765,14 @@ void CControlAPI::SendChannelList(CyhookHandler *hh, bool currentTP)
CBouquetManager::ChannelIterator cit = mode == CZapitClient::MODE_RADIO ? g_bouquetManager->radioChannelsBegin() : g_bouquetManager->tvChannelsBegin(); CBouquetManager::ChannelIterator cit = mode == CZapitClient::MODE_RADIO ? g_bouquetManager->radioChannelsBegin() : g_bouquetManager->tvChannelsBegin();
for (; !(cit.EndOfChannels()); cit++) { for (; !(cit.EndOfChannels()); cit++) {
CZapitChannel * channel = *cit; CZapitChannel * channel = *cit;
if(!currentTP || (channel->channel_id >>16) == current_channel){ if(!currentTP || (channel->getChannelID() >>16) == current_channel){
size_t pos = std::find(v.begin(), v.end(), channel->channel_id) - v.begin(); size_t pos = std::find(v.begin(), v.end(), channel->getChannelID()) - v.begin();
if( pos < v.size() ) if( pos < v.size() )
continue; continue;
v.push_back(channel->channel_id); v.push_back(channel->getChannelID());
hh->printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS " %s\n", channel->channel_id, channel->getName().c_str()); hh->printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS " %s\n", channel->getChannelID(), channel->getName().c_str());
} }
} }
} }

46
src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
View File

@@ -300,11 +300,11 @@ std::string CNeutrinoYParser::func_get_channels_as_dropdown(CyhookHandler *, st
CEPGData epg; CEPGData epg;
CZapitChannel * channel = channels[j]; CZapitChannel * channel = channels[j];
char buf[100],id[20]; char buf[100],id[20];
sprintf(id,PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS,channel->channel_id); sprintf(id,PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS,channel->getChannelID());
std::string _sid = std::string(id); std::string _sid = std::string(id);
sel = (_sid == achannel_id) ? "selected=\"selected\"" : ""; sel = (_sid == achannel_id) ? "selected=\"selected\"" : "";
CEitManager::getInstance()->getActualEPGServiceKey(channel->channel_id, &epg); CEitManager::getInstance()->getActualEPGServiceKey(channel->getChannelID(), &epg);
sprintf(buf,"<option value=" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS " %s>%.20s - %.30s</option>\n", channel->channel_id, sel.c_str(), channel->getName().c_str(),epg.title.c_str()); sprintf(buf,"<option value=" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS " %s>%.20s - %.30s</option>\n", channel->getChannelID(), sel.c_str(), channel->getName().c_str(),epg.title.c_str());
yresult += buf; yresult += buf;
} }
} }
@@ -357,10 +357,10 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
{ {
CZapitChannel * channel = channels[j]; CZapitChannel * channel = channels[j];
CChannelEvent *event; CChannelEvent *event;
event = NeutrinoAPI->ChannelListEvents[channel->channel_id]; event = NeutrinoAPI->ChannelListEvents[channel->getChannelID()];
classname = (i++ & 1) ? 'a' : 'b'; classname = (i++ & 1) ? 'a' : 'b';
if (channel->channel_id == current_channel) if (channel->getChannelID() == current_channel)
classname = 'c'; classname = 'c';
std::string bouquetstr = (BouquetNr >= 0) ? ("&amp;bouquet=" + itoa(BouquetNr)) : ""; std::string bouquetstr = (BouquetNr >= 0) ? ("&amp;bouquet=" + itoa(BouquetNr)) : "";
@@ -369,8 +369,8 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
if(have_logos) if(have_logos)
yresult += string_printf("<td class=\"%c logo_cell\" width=\"44\" rowspan=\"2\"><a href=\"javascript:do_zap('" yresult += string_printf("<td class=\"%c logo_cell\" width=\"44\" rowspan=\"2\"><a href=\"javascript:do_zap('"
PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
"')\"><img class=\"channel_logo\" src=\"%s\"/></a></td>", classname, channel->channel_id, "')\"><img class=\"channel_logo\" src=\"%s\"/></a></td>", classname, channel->getChannelID(),
(NeutrinoAPI->getLogoFile(hh->WebserverConfigList["Tuxbox.LogosURL"], channel->channel_id)).c_str()); (NeutrinoAPI->getLogoFile(hh->WebserverConfigList["Tuxbox.LogosURL"], channel->getChannelID())).c_str());
/* timer slider */ /* timer slider */
if(event && event->duration > 0) if(event && event->duration > 0)
@@ -408,16 +408,16 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
"','" "','"
PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
"')\">%s</a>\n", "')\">%s</a>\n",
((channel->channel_id == current_channel) ? "<a name=\"akt\"></a>" : " "), ((channel->getChannelID() == current_channel) ? "<a name=\"akt\"></a>" : " "),
channel->channel_id, channel->getChannelID(),
channel->number /* num + j */, channel->number /* num + j */,
channel->getName().c_str(), channel->getName().c_str(),
(channel->getServiceType() == ST_NVOD_REFERENCE_SERVICE) ? " (NVOD)" : "", (channel->getServiceType() == ST_NVOD_REFERENCE_SERVICE) ? " (NVOD)" : "",
channel->channel_id, channel->getChannelID(),
channel->channel_id & 0xFFFFFFFFFFFFULL, channel->getChannelID() & 0xFFFFFFFFFFFFULL,
((NeutrinoAPI->ChannelListEvents[channel->channel_id]) ? "<img src=\"/images/elist.gif\" alt=\"Program preview\" style=\"border: 0px\" />" : "")); ((NeutrinoAPI->ChannelListEvents[channel->getChannelID()]) ? "<img src=\"/images/elist.gif\" alt=\"Program preview\" style=\"border: 0px\" />" : ""));
if (channel->channel_id == current_channel) if (channel->getChannelID() == current_channel)
yresult += string_printf("\n&nbsp;&nbsp;<a href=\"javascript:do_streaminfo()\"><img src=\"/images/streaminfo.png\" alt=\"Streaminfo\" style=\"border: 0px\" /></a>"); yresult += string_printf("\n&nbsp;&nbsp;<a href=\"javascript:do_streaminfo()\"><img src=\"/images/streaminfo.png\" alt=\"Streaminfo\" style=\"border: 0px\" /></a>");
yresult += string_printf("</td></tr></table>\n</td>\n</tr>\n"); yresult += string_printf("</td></tr></table>\n</td>\n</tr>\n");
@@ -425,7 +425,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
if (channel->getServiceType() == ST_NVOD_REFERENCE_SERVICE) if (channel->getServiceType() == ST_NVOD_REFERENCE_SERVICE)
{ {
CSectionsdClient::NVODTimesList nvod_list; CSectionsdClient::NVODTimesList nvod_list;
if (CEitManager::getInstance()->getNVODTimesServiceKey(channel->channel_id, nvod_list)) if (CEitManager::getInstance()->getNVODTimesServiceKey(channel->getChannelID(), nvod_list))
{ {
CZapitClient::subServiceList subServiceList; CZapitClient::subServiceList subServiceList;
@@ -465,10 +465,10 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
} }
} }
else if ((event = NeutrinoAPI->ChannelListEvents[channel->channel_id])) else if ((event = NeutrinoAPI->ChannelListEvents[channel->getChannelID()]))
{ {
bool has_current_next = true; bool has_current_next = true;
CEitManager::getInstance()->getCurrentNextServiceKey(channel->channel_id, currentNextInfo); CEitManager::getInstance()->getCurrentNextServiceKey(channel->getChannelID(), currentNextInfo);
timestr = timeString(event->startTime); timestr = timeString(event->startTime);
yresult += string_printf("<tr><td class=\"%cepg\">",classname); yresult += string_printf("<tr><td class=\"%cepg\">",classname);
@@ -1070,23 +1070,23 @@ std::string CNeutrinoYParser::func_set_timer_form(CyhookHandler *hh, std::strin
for (; !(cit.EndOfChannels()); cit++) { for (; !(cit.EndOfChannels()); cit++) {
if (((*cit)->flags & CZapitChannel::REMOVED) || (*cit)->flags & CZapitChannel::NOT_FOUND) if (((*cit)->flags & CZapitChannel::REMOVED) || (*cit)->flags & CZapitChannel::NOT_FOUND)
continue; continue;
sel = ((*cit)->channel_id == current_channel) ? "selected=\"selected\"" : ""; sel = ((*cit)->getChannelID() == current_channel) ? "selected=\"selected\"" : "";
hh->ParamList["program_row"] += hh->ParamList["program_row"] +=
string_printf("<option value=\"" string_printf("<option value=\""
PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
"\" %s>%s</option>\n", "\" %s>%s</option>\n",
(*cit)->channel_id, sel.c_str(), (*cit)->getName().c_str()); (*cit)->getChannelID(), sel.c_str(), (*cit)->getName().c_str());
} }
cit = g_bouquetManager->radioChannelsBegin(); cit = g_bouquetManager->radioChannelsBegin();
for (; !(cit.EndOfChannels()); cit++) { for (; !(cit.EndOfChannels()); cit++) {
if (((*cit)->flags & CZapitChannel::REMOVED) || (*cit)->flags & CZapitChannel::NOT_FOUND) if (((*cit)->flags & CZapitChannel::REMOVED) || (*cit)->flags & CZapitChannel::NOT_FOUND)
continue; continue;
sel = ((*cit)->channel_id == current_channel) ? "selected=\"selected\"" : ""; sel = ((*cit)->getChannelID() == current_channel) ? "selected=\"selected\"" : "";
hh->ParamList["program_row"] += hh->ParamList["program_row"] +=
string_printf("<option value=\"" string_printf("<option value=\""
PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
"\" %s>%s</option>\n", "\" %s>%s</option>\n",
(*cit)->channel_id, sel.c_str(), (*cit)->getName().c_str()); (*cit)->getChannelID(), sel.c_str(), (*cit)->getName().c_str());
} }
// recordingDir // recordingDir
hh->ParamList["RECORD_DIR_MAXLEN"] = itoa(RECORD_DIR_MAXLEN-1); hh->ParamList["RECORD_DIR_MAXLEN"] = itoa(RECORD_DIR_MAXLEN-1);
@@ -1174,7 +1174,7 @@ std::string CNeutrinoYParser::func_set_bouquet_edit_form(CyhookHandler *hh, std
string_printf("<option value=\"" string_printf("<option value=\""
PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
"\">%s</option>\n", "\">%s</option>\n",
(*channels)[j]->channel_id, (*channels)[j]->getChannelID(),
(*channels)[j]->getName().c_str()); (*channels)[j]->getName().c_str());
} }
ZapitChannelList Channels; ZapitChannelList Channels;
@@ -1187,12 +1187,12 @@ std::string CNeutrinoYParser::func_set_bouquet_edit_form(CyhookHandler *hh, std
sort(Channels.begin(), Channels.end(), CmpChannelByChName()); sort(Channels.begin(), Channels.end(), CmpChannelByChName());
for (int i = 0; i < (int) Channels.size(); i++) { for (int i = 0; i < (int) Channels.size(); i++) {
if (!g_bouquetManager->existsChannelInBouquet(selected, Channels[i]->channel_id)){ if (!g_bouquetManager->existsChannelInBouquet(selected, Channels[i]->getChannelID())){
hh->ParamList["all_channels"] += hh->ParamList["all_channels"] +=
string_printf("<option value=\"" string_printf("<option value=\""
PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
"\">%s</option>\n", "\">%s</option>\n",
Channels[i]->channel_id, Channels[i]->getChannelID(),
Channels[i]->getName().c_str()); Channels[i]->getName().c_str());
} }
} }

2
src/zapit/include/zapit/channel.h
View File

@@ -173,6 +173,7 @@ class CZapitChannel
void Init(); void Init();
friend class CChannelList; friend class CChannelList;
t_channel_id channel_id;
public: public:
typedef enum channel_flags { typedef enum channel_flags {
@@ -193,7 +194,6 @@ class CZapitChannel
int number; int number;
CChannelEvent currentEvent,nextEvent; CChannelEvent currentEvent,nextEvent;
int type; int type;
t_channel_id channel_id;
unsigned char scrambled; unsigned char scrambled;
char * pname; char * pname;
bool has_bouquet; bool has_bouquet;