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

- rename IS_WEBTV => IS_WEBCHAN

Browse Source 
Conflicts:
	src/zapit/src/capmt.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2017-11-03 09:36:19 +01:00
committed by Thilo Graf
parent 098f021a3c
commit 740fd3ac0d
18 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/daemonc/remotecontrol.cpp
View File

@@ -125,7 +125,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
//printf("[neutrino] timeout EVT_ZAP current %llx data %llx\n", current_channel_id, *(t_channel_id *)data);
if ((*(t_channel_id *)data) != current_channel_id) {
g_InfoViewer->chanready = 0;
if (!IS_WEBTV(current_channel_id))
if (!IS_WEBCHAN(current_channel_id))
g_Sectionsd->setServiceStopped();
CMoviePlayerGui::getInstance().stopPlayBack();
g_Zapit->zapTo_serviceID_NOWAIT(current_channel_id );
@@ -348,7 +348,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
else if (msg == NeutrinoMessages::EVT_TUNE_COMPLETE) {
t_channel_id chid = *(t_channel_id *)data;
printf("CRemoteControl::handleMsg: EVT_TUNE_COMPLETE (%016" PRIx64 ")\n", chid);
if(chid && !IS_WEBTV(chid))
if(chid && !IS_WEBCHAN(chid))
g_Sectionsd->setServiceChanged(chid, false);
return messages_return::handled;
}
@@ -730,7 +730,7 @@ void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::s
g_RCInput->killTimer(scrambled_timer);
//dvbsub_pause(true);
CZapit::getInstance()->Abort();
if (!IS_WEBTV(channel_id))
if (!IS_WEBCHAN(channel_id))
g_Sectionsd->setServiceStopped();
CMoviePlayerGui::getInstance().stopPlayBack();
g_Zapit->zapTo_serviceID_NOWAIT(channel_id);