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

gui/channellist.cpp: use getChannelID() in place of channel_id

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 64eda8566c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-01 (Mon, 01 Jun 2015)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2015-06-01 14:19:59 +03:00
parent 6d113f75ff
commit ed646c5b78
1 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/gui/channellist.cpp
View File

@@ -180,7 +180,7 @@ void CChannelList::updateEvents(unsigned int from, unsigned int to)
time_t atime = time(NULL); time_t atime = time(NULL);
unsigned int count; unsigned int count;
for (count = from; count < to; count++) { for (count = from; count < to; count++) {
CEitManager::getInstance()->getEventsServiceKey((*chanlist)[count]->channel_id, events); CEitManager::getInstance()->getEventsServiceKey((*chanlist)[count]->getChannelID(), events);
(*chanlist)[count]->nextEvent.startTime = (long)0x7fffffff; (*chanlist)[count]->nextEvent.startTime = (long)0x7fffffff;
for ( CChannelEventList::iterator e= events.begin(); e != events.end(); ++e ) { for ( CChannelEventList::iterator e= events.begin(); e != events.end(); ++e ) {
if ((long)e->startTime > atime && if ((long)e->startTime > atime &&
@@ -199,13 +199,13 @@ void CChannelList::updateEvents(unsigned int from, unsigned int to)
return; return;
} }
for (uint32_t count = 0; count < chanlist_size; count++) for (uint32_t count = 0; count < chanlist_size; count++)
p_requested_channels[count] = (*chanlist)[count + from]->channel_id; p_requested_channels[count] = (*chanlist)[count + from]->getChannelID();
CEitManager::getInstance()->getChannelEvents(events, p_requested_channels, chanlist_size); CEitManager::getInstance()->getChannelEvents(events, p_requested_channels, chanlist_size);
for (uint32_t count=0; count < chanlist_size; count++) { for (uint32_t count=0; count < chanlist_size; count++) {
(*chanlist)[count + from]->currentEvent = CChannelEvent(); (*chanlist)[count + from]->currentEvent = CChannelEvent();
for (CChannelEventList::iterator e = events.begin(); e != events.end(); ++e) { for (CChannelEventList::iterator e = events.begin(); e != events.end(); ++e) {
if (((*chanlist)[count + from]->channel_id&0xFFFFFFFFFFFFULL) == e->get_channel_id()) { if (((*chanlist)[count + from]->getChannelID()&0xFFFFFFFFFFFFULL) == e->get_channel_id()) {
(*chanlist)[count + from]->currentEvent = *e; (*chanlist)[count + from]->currentEvent = *e;
break; break;
} }
@@ -247,7 +247,7 @@ CZapitChannel* CChannelList::getChannel(int number)
CZapitChannel* CChannelList::getChannel(t_channel_id channel_id) CZapitChannel* CChannelList::getChannel(t_channel_id channel_id)
{ {
for (uint32_t i=0; i< (*chanlist).size(); i++) { for (uint32_t i=0; i< (*chanlist).size(); i++) {
if ((*chanlist)[i]->channel_id == channel_id) if ((*chanlist)[i]->getChannelID() == channel_id)
return (*chanlist)[i]; return (*chanlist)[i];
} }
return(NULL); return(NULL);
@@ -278,7 +278,7 @@ t_satellite_position CChannelList::getActiveSatellitePosition(void) const
t_channel_id CChannelList::getActiveChannel_ChannelID(void) const t_channel_id CChannelList::getActiveChannel_ChannelID(void) const
{ {
if (selected < (*chanlist).size()) if (selected < (*chanlist).size())
return (*chanlist)[selected]->channel_id; return (*chanlist)[selected]->getChannelID();
return 0; return 0;
} }
@@ -343,7 +343,7 @@ int CChannelList::doChannelMenu(void)
if(select >= 0) { if(select >= 0) {
//signed int bouquet_id = 0; //signed int bouquet_id = 0;
old_selected = select; old_selected = select;
t_channel_id channel_id = empty ? 0 : (*chanlist)[selected]->channel_id; t_channel_id channel_id = empty ? 0 : (*chanlist)[selected]->getChannelID();
bool tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV; bool tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV;
CBouquetList *blist = tvmode ? TVfavList : RADIOfavList; CBouquetList *blist = tvmode ? TVfavList : RADIOfavList;
bool fav_found = true; bool fav_found = true;
@@ -441,7 +441,7 @@ int CChannelList::exec()
int nNewChannel = show(); int nNewChannel = show();
if ( nNewChannel > -1 && nNewChannel < (int) (*chanlist).size()) { if ( nNewChannel > -1 && nNewChannel < (int) (*chanlist).size()) {
if(this->historyMode && (*chanlist)[nNewChannel]) { if(this->historyMode && (*chanlist)[nNewChannel]) {
int new_mode = CNeutrinoApp::getInstance()->channelList->getLastChannels().get_mode((*chanlist)[nNewChannel]->channel_id); int new_mode = CNeutrinoApp::getInstance()->channelList->getLastChannels().get_mode((*chanlist)[nNewChannel]->getChannelID());
if(new_mode >= 0) if(new_mode >= 0)
CNeutrinoApp::getInstance()->SetChannelMode(new_mode); CNeutrinoApp::getInstance()->SetChannelMode(new_mode);
} }
@@ -519,8 +519,8 @@ void CChannelList::calcSize()
recmode_icon_max = std::max(recmode_icon_max, icon_w); recmode_icon_max = std::max(recmode_icon_max, icon_w);
for (uint32_t i = 0; i < (*chanlist).size(); i++) { for (uint32_t i = 0; i < (*chanlist).size(); i++) {
if (CRecordManager::getInstance()->GetRecordMode((*chanlist)[i]->channel_id) || if (CRecordManager::getInstance()->GetRecordMode((*chanlist)[i]->getChannelID()) ||
(*chanlist)[i]->channel_id == CZapit::getInstance()->GetPipChannelID()) { (*chanlist)[i]->getChannelID() == CZapit::getInstance()->GetPipChannelID()) {
ChannelList_Rec = recmode_icon_max; ChannelList_Rec = recmode_icon_max;
break; break;
} }
@@ -644,10 +644,10 @@ int CChannelList::show()
} }
} }
else if(!edit_state && !empty && msg == (neutrino_msg_t) g_settings.key_record) { //start direct recording from channellist else if(!edit_state && !empty && msg == (neutrino_msg_t) g_settings.key_record) { //start direct recording from channellist
if((g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) && SameTP() && !IS_WEBTV((*chanlist)[selected]->channel_id)) { if((g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) && SameTP() && !IS_WEBTV((*chanlist)[selected]->getChannelID())) {
printf("[neutrino channellist] start direct recording...\n"); printf("[neutrino channellist] start direct recording...\n");
hide(); hide();
if (!CRecordManager::getInstance()->Record((*chanlist)[selected]->channel_id)) { if (!CRecordManager::getInstance()->Record((*chanlist)[selected]->getChannelID())) {
paint(); paint();
} else { } else {
selected = oldselected; selected = oldselected;
@@ -656,15 +656,15 @@ int CChannelList::show()
} }
} }
else if(!edit_state && !empty && msg == CRCInput::RC_stop ) { //stop recording else if(!edit_state && !empty && msg == CRCInput::RC_stop ) { //stop recording
//if(CRecordManager::getInstance()->RecordingStatus((*chanlist)[selected]->channel_id)) //if(CRecordManager::getInstance()->RecordingStatus((*chanlist)[selected]->getChannelID()))
int recmode = CRecordManager::getInstance()->GetRecordMode((*chanlist)[selected]->channel_id); int recmode = CRecordManager::getInstance()->GetRecordMode((*chanlist)[selected]->getChannelID());
bool timeshift = recmode & CRecordManager::RECMODE_TSHIFT; bool timeshift = recmode & CRecordManager::RECMODE_TSHIFT;
bool tsplay = CMoviePlayerGui::getInstance().timeshift; bool tsplay = CMoviePlayerGui::getInstance().timeshift;
if (recmode && !(timeshift && tsplay)) if (recmode && !(timeshift && tsplay))
{ {
if (CRecordManager::getInstance()->AskToStop((*chanlist)[selected]->channel_id)) if (CRecordManager::getInstance()->AskToStop((*chanlist)[selected]->getChannelID()))
{ {
CRecordManager::getInstance()->Stop((*chanlist)[selected]->channel_id); CRecordManager::getInstance()->Stop((*chanlist)[selected]->getChannelID());
calcSize(); calcSize();
paintBody(); paintBody();
} }
@@ -678,7 +678,7 @@ int CChannelList::show()
hide(); hide();
/* RETURN_EXIT_ALL on FAV/SAT buttons or messages_return::cancel_all from CNeutrinoApp::getInstance()->handleMsg() */ /* RETURN_EXIT_ALL on FAV/SAT buttons or messages_return::cancel_all from CNeutrinoApp::getInstance()->handleMsg() */
if ( g_EventList->exec((*chanlist)[selected]->channel_id, (*chanlist)[selected]->getName()) == menu_return::RETURN_EXIT_ALL) { if ( g_EventList->exec((*chanlist)[selected]->getChannelID(), (*chanlist)[selected]->getName()) == menu_return::RETURN_EXIT_ALL) {
res = CHANLIST_CANCEL_ALL; res = CHANLIST_CANCEL_ALL;
loop = false; loop = false;
} else { } else {
@@ -905,9 +905,9 @@ int CChannelList::show()
p_event = &((*chanlist)[selected]->nextEvent); p_event = &((*chanlist)[selected]->nextEvent);
if(p_event && p_event->eventID) if(p_event && p_event->eventID)
g_EpgData->show((*chanlist)[selected]->channel_id,p_event->eventID,&(p_event->startTime)); g_EpgData->show((*chanlist)[selected]->getChannelID(),p_event->eventID,&(p_event->startTime));
else else
g_EpgData->show((*chanlist)[selected]->channel_id); g_EpgData->show((*chanlist)[selected]->getChannelID());
paint(); paint();
} else if (msg == NeutrinoMessages::EVT_SERVICESCHANGED || msg == NeutrinoMessages::EVT_BOUQUETSCHANGED) { } else if (msg == NeutrinoMessages::EVT_SERVICESCHANGED || msg == NeutrinoMessages::EVT_BOUQUETSCHANGED) {
@@ -1083,7 +1083,7 @@ bool CChannelList::adjustToChannelID(const t_channel_id channel_id)
printf("CChannelList::adjustToChannelID me %p [%s] list size %d channel_id %" PRIx64 "\n", this, getName(), (int)(*chanlist).size(), channel_id); printf("CChannelList::adjustToChannelID me %p [%s] list size %d channel_id %" PRIx64 "\n", this, getName(), (int)(*chanlist).size(), channel_id);
selected_chid = channel_id; selected_chid = channel_id;
for (unsigned int i = 0; i < (*chanlist).size(); i++) { for (unsigned int i = 0; i < (*chanlist).size(); i++) {
if ((*chanlist)[i]->channel_id == channel_id) { if ((*chanlist)[i]->getChannelID() == channel_id) {
selected = i; selected = i;
tuned = i; tuned = i;
return true; return true;
@@ -1108,7 +1108,7 @@ int CChannelList::hasChannel(int nChannelNr)
int CChannelList::hasChannelID(t_channel_id channel_id) int CChannelList::hasChannelID(t_channel_id channel_id)
{ {
for (uint32_t i=0; i < (*chanlist).size(); i++) { for (uint32_t i=0; i < (*chanlist).size(); i++) {
if ((*chanlist)[i]->channel_id == channel_id) if ((*chanlist)[i]->getChannelID() == channel_id)
return i; return i;
} }
return -1; return -1;
@@ -1132,7 +1132,7 @@ bool CChannelList::zapTo_ChannelID(const t_channel_id channel_id, bool force)
{ {
printf("**************************** CChannelList::zapTo_ChannelID %" PRIx64 "\n", channel_id); printf("**************************** CChannelList::zapTo_ChannelID %" PRIx64 "\n", channel_id);
for (unsigned int i = 0; i < (*chanlist).size(); i++) { for (unsigned int i = 0; i < (*chanlist).size(); i++) {
if ((*chanlist)[i]->channel_id == channel_id) { if ((*chanlist)[i]->getChannelID() == channel_id) {
zapTo(i, force); zapTo(i, force);
return true; return true;
} }
@@ -1184,7 +1184,7 @@ void CChannelList::zapToChannel(CZapitChannel *channel, bool force)
if (tuned < (*chanlist).size() && (*chanlist)[tuned]->last_unlocked_time != 0) if (tuned < (*chanlist).size() && (*chanlist)[tuned]->last_unlocked_time != 0)
(*chanlist)[tuned]->last_unlocked_time = time_monotonic(); (*chanlist)[tuned]->last_unlocked_time = time_monotonic();
printf("**************************** CChannelList::zapToChannel me %p %s tuned %d new %s -> %" PRIx64 "\n", this, name.c_str(), tuned, channel->getName().c_str(), channel->channel_id); printf("**************************** CChannelList::zapToChannel me %p %s tuned %d new %s -> %" PRIx64 "\n", this, name.c_str(), tuned, channel->getName().c_str(), channel->getChannelID());
if(tuned < (*chanlist).size()) if(tuned < (*chanlist).size())
selected_chid = (*chanlist)[tuned]->getChannelID(); selected_chid = (*chanlist)[tuned]->getChannelID();
@@ -1205,7 +1205,7 @@ void CChannelList::zapToChannel(CZapitChannel *channel, bool force)
g_InfoViewer->handleMsg(NeutrinoMessages::EVT_RECORDMODE, 0); g_InfoViewer->handleMsg(NeutrinoMessages::EVT_RECORDMODE, 0);
g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR, 0 ); g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR, 0 );
CNeutrinoApp::getInstance()->channelList->getLastChannels().set_mode(channel->channel_id); CNeutrinoApp::getInstance()->channelList->getLastChannels().set_mode(channel->getChannelID());
} }
} }
@@ -1235,9 +1235,9 @@ int CChannelList::numericZap(int key)
CChannelList * channelList = new CChannelList(g_Locale->getText(LOCALE_CHANNELLIST_CURRENT_TP), false, true); CChannelList * channelList = new CChannelList(g_Locale->getText(LOCALE_CHANNELLIST_CURRENT_TP), false, true);
if(key == g_settings.key_current_transponder) { if(key == g_settings.key_current_transponder) {
t_channel_id recid = (*chanlist)[selected]->channel_id >> 16; t_channel_id recid = (*chanlist)[selected]->getChannelID() >> 16;
for ( unsigned int i = 0 ; i < (*orgList->chanlist).size(); i++) { for ( unsigned int i = 0 ; i < (*orgList->chanlist).size(); i++) {
if(((*orgList->chanlist)[i]->channel_id >> 16) == recid) if(((*orgList->chanlist)[i]->getChannelID() >> 16) == recid)
channelList->addChannel((*orgList->chanlist)[i]); channelList->addChannel((*orgList->chanlist)[i]);
} }
} else { } else {
@@ -1371,7 +1371,7 @@ int CChannelList::numericZap(int key)
g_InfoViewer->showTitle(getActiveChannel(), true); g_InfoViewer->showTitle(getActiveChannel(), true);
g_InfoViewer->killTitle(); g_InfoViewer->killTitle();
if (chan && showEPG) if (chan && showEPG)
g_EventList->exec(chan->channel_id, chan->getName()); g_EventList->exec(chan->getChannelID(), chan->getName());
} }
return res; return res;
} }
@@ -1485,7 +1485,7 @@ void CChannelList::virtual_zap_mode(bool up)
bouquetList->activateBouquet(old_bactive, false); bouquetList->activateBouquet(old_bactive, false);
if (showEPG && channel) if (showEPG && channel)
g_EventList->exec(channel->channel_id, channel->getName()); g_EventList->exec(channel->getChannelID(), channel->getName());
} }
} }
@@ -1528,7 +1528,7 @@ void CChannelList::paintDetails(int index)
else else
p_event = &(*chanlist)[index]->currentEvent; p_event = &(*chanlist)[index]->currentEvent;
if (!IS_WEBTV((*chanlist)[index]->channel_id) && !p_event->description.empty()) { if (!IS_WEBTV((*chanlist)[index]->getChannelID()) && !p_event->description.empty()) {
char cNoch[50] = {0}; // UTF-8 char cNoch[50] = {0}; // UTF-8
char cSeit[50] = {0}; // UTF-8 char cSeit[50] = {0}; // UTF-8
@@ -1592,7 +1592,7 @@ void CChannelList::paintDetails(int index)
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x+ full_width- 10- seit_len, y+ height+ 5+ fheight, seit_len, cSeit, colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT); g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x+ full_width- 10- seit_len, y+ height+ 5+ fheight, seit_len, cSeit, colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT);
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x+ full_width- 10- noch_len, y+ height+ 5+ fdescrheight+ fheight, noch_len, cNoch, colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT); g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x+ full_width- 10- noch_len, y+ height+ 5+ fdescrheight+ fheight, noch_len, cNoch, colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT);
} }
if (IS_WEBTV((*chanlist)[index]->channel_id)) { if (IS_WEBTV((*chanlist)[index]->getChannelID())) {
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ fheight, full_width - 30, (*chanlist)[index]->getDesc(), colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT, 0, true); g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ fheight, full_width - 30, (*chanlist)[index]->getDesc(), colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT, 0, true);
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ 2*fheight + fdescrheight, full_width - 30, (*chanlist)[index]->getUrl(), COL_MENUCONTENTDARK_TEXT, 0, true); g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ 2*fheight + fdescrheight, full_width - 30, (*chanlist)[index]->getUrl(), COL_MENUCONTENTDARK_TEXT, 0, true);
} else if(g_settings.channellist_foot == 0) { } else if(g_settings.channellist_foot == 0) {
@@ -1610,7 +1610,7 @@ void CChannelList::paintDetails(int index)
else if( !displayNext && g_settings.channellist_foot == 1) { // next Event else if( !displayNext && g_settings.channellist_foot == 1) { // next Event
CSectionsdClient::CurrentNextInfo CurrentNext; CSectionsdClient::CurrentNextInfo CurrentNext;
CEitManager::getInstance()->getCurrentNextServiceKey((*chanlist)[index]->channel_id, CurrentNext); CEitManager::getInstance()->getCurrentNextServiceKey((*chanlist)[index]->getChannelID(), CurrentNext);
if (!CurrentNext.next_name.empty()) { if (!CurrentNext.next_name.empty()) {
char buf[128] = {0}; char buf[128] = {0};
char cFrom[50] = {0}; // UTF-8 char cFrom[50] = {0}; // UTF-8
@@ -1677,7 +1677,7 @@ void CChannelList::showChannelLogo()
CChannelLogo->hide(); CChannelLogo->hide();
delete CChannelLogo; delete CChannelLogo;
} }
CChannelLogo = new CComponentsChannelLogoScalable(0, 0, (*chanlist)[selected]->getName(), (*chanlist)[selected]->channel_id); CChannelLogo = new CComponentsChannelLogoScalable(0, 0, (*chanlist)[selected]->getName(), (*chanlist)[selected]->getChannelID());
if (CChannelLogo->hasLogo()){ if (CChannelLogo->hasLogo()){
int h_logo = CChannelLogo->getHeight(); int h_logo = CChannelLogo->getHeight();
@@ -1735,7 +1735,7 @@ void CChannelList::paintButtonBar(bool is_current)
} }
t_channel_id channel_id = 0; t_channel_id channel_id = 0;
if (!(*chanlist).empty()) if (!(*chanlist).empty())
channel_id = (*chanlist)[selected]->channel_id; channel_id = (*chanlist)[selected]->getChannelID();
struct button_label Button[NUM_LIST_BUTTONS_SORT]; struct button_label Button[NUM_LIST_BUTTONS_SORT];
bool do_record = CRecordManager::getInstance()->RecordingStatus(getActiveChannel_ChannelID()); bool do_record = CRecordManager::getInstance()->RecordingStatus(getActiveChannel_ChannelID());
@@ -1885,7 +1885,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
p_event = &chan->currentEvent; p_event = &chan->currentEvent;
//record check //record check
rec_mode = CRecordManager::getInstance()->GetRecordMode((*chanlist)[curr]->channel_id); rec_mode = CRecordManager::getInstance()->GetRecordMode((*chanlist)[curr]->getChannelID());
//set recording icon //set recording icon
std::string rec_icon; std::string rec_icon;
@@ -1894,7 +1894,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
else if (rec_mode & CRecordManager::RECMODE_TSHIFT) else if (rec_mode & CRecordManager::RECMODE_TSHIFT)
rec_icon = NEUTRINO_ICON_AUTO_SHIFT; rec_icon = NEUTRINO_ICON_AUTO_SHIFT;
#ifdef ENABLE_PIP #ifdef ENABLE_PIP
else if ((*chanlist)[curr]->channel_id == CZapit::getInstance()->GetPipChannelID()) else if ((*chanlist)[curr]->getChannelID() == CZapit::getInstance()->GetPipChannelID())
rec_icon = NEUTRINO_ICON_PIP; rec_icon = NEUTRINO_ICON_PIP;
#endif #endif
//calculating icons //calculating icons
@@ -2237,7 +2237,7 @@ void CChannelList::paintPig (int _x, int _y, int w, int h)
void CChannelList::paint_events(int index) void CChannelList::paint_events(int index)
{ {
ffheight = g_Font[eventFont]->getHeight(); ffheight = g_Font[eventFont]->getHeight();
readEvents((*chanlist)[index]->channel_id); readEvents((*chanlist)[index]->getChannelID());
frameBuffer->paintBoxRel(x+ width,y+ theight+pig_height, infozone_width, infozone_height,COL_MENUCONTENT_PLUS_0); frameBuffer->paintBoxRel(x+ width,y+ theight+pig_height, infozone_width, infozone_height,COL_MENUCONTENT_PLUS_0);
char startTime[10]; char startTime[10];
@@ -2491,7 +2491,7 @@ void CChannelList::deleteChannel(bool ask)
if (ask && ShowMsg(LOCALE_FILEBROWSER_DELETE, (*chanlist)[selected]->getName(), CMessageBox::mbrNo, CMessageBox::mbYes|CMessageBox::mbNo)!=CMessageBox::mbrYes) if (ask && ShowMsg(LOCALE_FILEBROWSER_DELETE, (*chanlist)[selected]->getName(), CMessageBox::mbrNo, CMessageBox::mbYes|CMessageBox::mbNo)!=CMessageBox::mbrYes)
return; return;
bouquet->zapitBouquet->removeService((*chanlist)[selected]->channel_id); bouquet->zapitBouquet->removeService((*chanlist)[selected]->getChannelID());
bool tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV; bool tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV;
chanlist = tvmode ? &bouquet->zapitBouquet->tvChannels : &bouquet->zapitBouquet->radioChannels; chanlist = tvmode ? &bouquet->zapitBouquet->tvChannels : &bouquet->zapitBouquet->radioChannels;
@@ -2561,7 +2561,7 @@ bool CChannelList::addChannelToBouquet()
if(bouquet_id < 0) if(bouquet_id < 0)
return false; return false;
t_channel_id channel_id = (*chanlist)[selected]->channel_id; t_channel_id channel_id = (*chanlist)[selected]->getChannelID();
bool tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV; bool tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV;
CBouquetList *blist = tvmode ? TVfavList : RADIOfavList; CBouquetList *blist = tvmode ? TVfavList : RADIOfavList;
if (AllFavBouquetList->Bouquets[bouquet_id]->zapitBouquet) { if (AllFavBouquetList->Bouquets[bouquet_id]->zapitBouquet) {