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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5dd90e3c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-25 00:17:33 +01:00
parent 7611571c60 2343041a0f
commit b21ec915f5
6 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/neutrino.cpp
View File

@@ -2211,7 +2211,11 @@ void CNeutrinoApp::InitSectiondClient()
dprintf(DEBUG_NORMAL, "had to wait %ld ms for sectionsd to start up\n", time_monotonic_ms() - t);
#endif
g_Sectionsd = new CSectionsdClient;
g_Sectionsd->registerEvent(CSectionsdClient::EVT_TIMESET, 222, NEUTRINO_UDS_NAME);
struct timespec t;
if (clock_gettime(CLOCK_MONOTONIC, &t)) {
dprintf(DEBUG_NORMAL, "CLOCK_MONOTONIC not supported? (%m), falling back to EVT_TIMESET\n");
g_Sectionsd->registerEvent(CSectionsdClient::EVT_TIMESET, 222, NEUTRINO_UDS_NAME);
}
g_Sectionsd->registerEvent(CSectionsdClient::EVT_GOT_CN_EPG, 222, NEUTRINO_UDS_NAME);
g_Sectionsd->registerEvent(CSectionsdClient::EVT_EIT_COMPLETE, 222, NEUTRINO_UDS_NAME);
g_Sectionsd->registerEvent(CSectionsdClient::EVT_WRITE_SI_FINISHED, 222, NEUTRINO_UDS_NAME);
@@ -3516,7 +3520,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
if (rec_mode == CRecordManager::RECMODE_OFF || rec_mode == CRecordManager::RECMODE_TSHIFT)
CRecordManager::getInstance()->Record(live_channel_id);
delete[] (unsigned char*) data;
return messages_return::handled | messages_return::cancel_all;
return messages_return::handled;
}
if(mode == mode_standby){
if((eventinfo->channel_id != live_channel_id) && !(SAME_TRANSPONDER(live_channel_id, eventinfo->channel_id)))
@@ -3534,7 +3538,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
}
delete[] (unsigned char*) data;
return messages_return::handled | messages_return::cancel_all;
return messages_return::handled;
}
else if( msg == NeutrinoMessages::RECORD_STOP) {
CTimerd::RecordingStopInfo* recinfo = (CTimerd::RecordingStopInfo*)data;