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

Merge remote-tracking branch 'uncool/cst-next'

Browse Source 
This need buildfixes and some functional updates...
This commit is contained in:
Stefan Seyfried
2015-12-13 17:41:55 +01:00
parent 83c385c126 8f810d52fa
commit eeee5bacab
320 changed files with 21291 additions and 13199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/daemonc/remotecontrol.cpp
View File

@@ -129,7 +129,6 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
g_Sectionsd->setServiceStopped();
CMoviePlayerGui::getInstance().stopPlayBack();
g_Zapit->zapTo_serviceID_NOWAIT(current_channel_id );
//g_Sectionsd->setServiceChanged(current_channel_id, false);
zap_completion_timeout = time_monotonic_ms() + ZAP_GUARD_TIME;
@@ -177,7 +176,6 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
director_mode = 0;
needs_nvods = (msg == NeutrinoMessages:: EVT_ZAP_ISNVOD);
//g_Sectionsd->setServiceChanged( current_channel_id, true );
CNeutrinoApp::getInstance()->adjustToChannelID(current_channel_id);
if ( g_InfoViewer->is_visible )
g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR , 0 );
@@ -316,11 +314,11 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
{
getNVODs();
if (subChannels.empty())
g_Sectionsd->setServiceChanged( current_channel_id, true );
g_Sectionsd->setServiceChanged( current_channel_id, false);
}
else
// EVENT anfordern!
g_Sectionsd->setServiceChanged( current_channel_id, true );
g_Sectionsd->setServiceChanged( current_channel_id, false);
}
return messages_return::handled;
@@ -339,13 +337,9 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
#endif
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);
printf("CRemoteControl::handleMsg: EVT_TUNE_COMPLETE (%016" PRIx64 ")\n", chid);
if(chid && !IS_WEBTV(chid))
g_Sectionsd->setServiceChanged( chid, true );
#if 0
else
g_Sectionsd->setServiceChanged( current_channel_id, true );
#endif
g_Sectionsd->setServiceChanged(chid, false);
return messages_return::handled;
}
//else if (msg == NeutrinoMessages::EVT_ZAP_FAILED || msg == NeutrinoMessages::EVT_ZAP_SUB_FAILED)
@@ -635,8 +629,6 @@ const std::string & CRemoteControl::setSubChannel(const int numSub, const bool f
CMoviePlayerGui::getInstance().stopPlayBack();
g_Zapit->zapTo_subServiceID_NOWAIT( current_sub_channel_id );
// Houdini: to restart reading the private EPG when switching to a new option
//g_Sectionsd->setServiceChanged( current_sub_channel_id , true );
return subChannels[numSub].subservice_name;
}
@@ -720,7 +712,6 @@ void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::s
g_Zapit->zapTo_serviceID_NOWAIT(channel_id);
zap_completion_timeout = now + ZAP_GUARD_TIME;
//g_Sectionsd->setServiceChanged( channel_id, false );
// g_RCInput->killTimer( current_programm_timer );
}
current_channel_id = channel_id;