mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

scan epg: fix shadow warning

Browse Source 
- fix display menuhint
This commit is contained in:
Michael Liebmann
2013-06-12 17:44:48 +02:00
parent 950d85e41b
commit 7833cd4dc6
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/driver/scanepg.cpp
View File

@@ -67,6 +67,7 @@ void CEpgScan::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
if (!g_settings.epg_scan || CFEManager::getInstance()->getEnabledCount() <= 1) if (!g_settings.epg_scan || CFEManager::getInstance()->getEnabledCount() <= 1)
return; return;
CZapitChannel * newchan;
if(msg == NeutrinoMessages::EVT_ZAP_COMPLETE) { if(msg == NeutrinoMessages::EVT_ZAP_COMPLETE) {
if(bouquetList->Bouquets.empty()) if(bouquetList->Bouquets.empty())
return; return;
@@ -87,7 +88,7 @@ void CEpgScan::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
} }
else if (msg == NeutrinoMessages::EVT_EIT_COMPLETE) { else if (msg == NeutrinoMessages::EVT_EIT_COMPLETE) {
t_channel_id chid = *(t_channel_id *)data; t_channel_id chid = *(t_channel_id *)data;
CZapitChannel * newchan = CServiceManager::getInstance()->FindChannel(chid); newchan = CServiceManager::getInstance()->FindChannel(chid);
if (newchan) { if (newchan) {
scanned.insert(newchan->getTransponderId()); scanned.insert(newchan->getTransponderId());
scanmap.erase(newchan->getTransponderId()); scanmap.erase(newchan->getTransponderId());
@@ -107,7 +108,7 @@ void CEpgScan::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
CFEManager::getInstance()->lockFrontend(pip_fe); CFEManager::getInstance()->lockFrontend(pip_fe);
#endif #endif
for (eit_scanmap_iterator_t it = scanmap.begin(); it != scanmap.end(); /* ++it*/) { for (eit_scanmap_iterator_t it = scanmap.begin(); it != scanmap.end(); /* ++it*/) {
CZapitChannel * newchan = CServiceManager::getInstance()->FindChannel(it->second); newchan = CServiceManager::getInstance()->FindChannel(it->second);
if ((newchan == NULL) || SAME_TRANSPONDER(live_channel_id, newchan->getChannelID())) { if ((newchan == NULL) || SAME_TRANSPONDER(live_channel_id, newchan->getChannelID())) {
scanmap.erase(it++); scanmap.erase(it++);
continue; continue;

2
src/gui/miscsettings_menu.cpp
View File

@@ -348,7 +348,7 @@ void CMiscMenue::showMiscSettingsMenuEpg(CMenuWidget *ms_epg)
CMenuOptionChooser * mc2 = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SCAN, &g_settings.epg_scan, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, CMenuOptionChooser * mc2 = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SCAN, &g_settings.epg_scan, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT,
CFEManager::getInstance()->getEnabledCount() > 1); CFEManager::getInstance()->getEnabledCount() > 1);
mc1->setHint("", LOCALE_MENU_HINT_EPG_SCAN); mc2->setHint("", LOCALE_MENU_HINT_EPG_SCAN);
ms_epg->addItem(mc); ms_epg->addItem(mc);
ms_epg->addItem(mc1); ms_epg->addItem(mc1);