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

driver/scanepg.cpp: change handleMsg() to return event handled/unhandled

Browse Source
This commit is contained in:
[CST] Focus
2013-10-14 12:45:23 +04:00
parent 5091e920fc
commit 3863008e3a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/driver/scanepg.cpp
View File

@@ -153,15 +153,16 @@ void CEpgScan::StopStandby()
CZapit::getInstance()->SetCurrentChannelID(live_channel_id); CZapit::getInstance()->SetCurrentChannelID(live_channel_id);
} }
void CEpgScan::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data) int CEpgScan::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
{ {
if (!g_settings.epg_scan || (!standby && (CFEManager::getInstance()->getEnabledCount() <= 1))) if (!g_settings.epg_scan || (!standby && (CFEManager::getInstance()->getEnabledCount() <= 1)))
return; return messages_return::unhandled;
CZapitChannel * newchan; CZapitChannel * newchan;
if(msg == NeutrinoMessages::EVT_ZAP_COMPLETE) { if(msg == NeutrinoMessages::EVT_ZAP_COMPLETE) {
AddTransponders(); AddTransponders();
INFO("EVT_ZAP_COMPLETE, scan map size: %d\n", scanmap.size()); INFO("EVT_ZAP_COMPLETE, scan map size: %d\n", scanmap.size());
return messages_return::handled;
} }
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;
@@ -173,6 +174,7 @@ void CEpgScan::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
INFO("EIT read complete [" PRINTF_CHANNEL_ID_TYPE "], scan map size: %d", chid, scanmap.size()); INFO("EIT read complete [" PRINTF_CHANNEL_ID_TYPE "], scan map size: %d", chid, scanmap.size());
Next(); Next();
return messages_return::handled;
} }
else if (msg == NeutrinoMessages::EVT_BACK_ZAP_COMPLETE) { else if (msg == NeutrinoMessages::EVT_BACK_ZAP_COMPLETE) {
t_channel_id chid = *(t_channel_id *)data; t_channel_id chid = *(t_channel_id *)data;
@@ -194,7 +196,9 @@ void CEpgScan::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
} }
} }
} }
return messages_return::handled;
} }
return messages_return::unhandled;
} }
void CEpgScan::EnterStandby() void CEpgScan::EnterStandby()

2
src/driver/scanepg.h
View File

@@ -48,7 +48,7 @@ class CEpgScan
~CEpgScan(); ~CEpgScan();
static CEpgScan * getInstance(); static CEpgScan * getInstance();
void handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data); int handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data);
void Next(); void Next();
void Clear(); void Clear();
void StartStandby(); void StartStandby();