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

eitd/sectionsd.cpp: wakeup threadEIT only, if case demux number is not 0 (live)

Browse Source 
and cached events count less than max;
set full channel_id as current service for threadEIT
This commit is contained in:
[CST] Focus
2013-06-12 18:21:39 +04:00
parent 8bedb877dd
commit 450099e04d
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/eitd/sectionsd.cpp
View File

@@ -900,9 +900,19 @@ static void commandserviceChanged(int connfd, char *data, const unsigned dataLen
if (dataLength != sizeof(sectionsd::commandSetServiceChanged)) if (dataLength != sizeof(sectionsd::commandSetServiceChanged))
return; return;
t_channel_id uniqueServiceKey = (((sectionsd::commandSetServiceChanged *)data)->channel_id); sectionsd::commandSetServiceChanged * cmd = (sectionsd::commandSetServiceChanged *)data;
t_channel_id uniqueServiceKey = cmd->channel_id;
xprintf("[sectionsd] commandserviceChanged: Service change to " PRINTF_CHANNEL_ID_TYPE "\n", uniqueServiceKey); xprintf("[sectionsd] commandserviceChanged: Service change to " PRINTF_CHANNEL_ID_TYPE " demux #%d\n", uniqueServiceKey, cmd->dnum);
/* assume live demux always 0, other means background scan */
if (cmd->dnum) {
/* dont wakeup EIT, if we have max events allready */
if (max_events && (mySIeventsOrderUniqueKey.size() < max_events)) {
threadEIT.setDemux(cmd->dnum);
threadEIT.setCurrentService(uniqueServiceKey);
}
return;
}
static t_channel_id time_trigger_last = 0; static t_channel_id time_trigger_last = 0;
@@ -930,7 +940,8 @@ static void commandserviceChanged(int connfd, char *data, const unsigned dataLen
unlockMessaging(); unlockMessaging();
threadCN.setCurrentService(messaging_current_servicekey); threadCN.setCurrentService(messaging_current_servicekey);
threadEIT.setCurrentService(messaging_current_servicekey); threadEIT.setDemux(cmd->dnum);
threadEIT.setCurrentService(uniqueServiceKey /*messaging_current_servicekey*/);
#ifdef ENABLE_FREESATEPG #ifdef ENABLE_FREESATEPG
threadFSEIT.setCurrentService(messaging_current_servicekey); threadFSEIT.setCurrentService(messaging_current_servicekey);
#endif #endif
@@ -1694,6 +1705,10 @@ void CEitThread::beforeSleep()
writeLockMessaging(); writeLockMessaging();
messaging_zap_detected = false; messaging_zap_detected = false;
unlockMessaging(); unlockMessaging();
eventServer->sendEvent(CSectionsdClient::EVT_EIT_COMPLETE,
CEventServer::INITID_SECTIONSD,
&current_service,
sizeof(messaging_current_servicekey));
if(notify_complete) if(notify_complete)
system(CONFIGDIR "/epgdone.sh"); system(CONFIGDIR "/epgdone.sh");
} }