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

daemonc/remotecontrol.cpp: disable setServiceChanged, add NeutrinoMessages::EVT_TUNE_COMPLETE

Browse Source
This commit is contained in:
[CST] Focus
2012-02-21 19:01:13 +04:00
parent 8abd63b799
commit dd3df586f0
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/daemonc/remotecontrol.cpp
View File

@@ -121,7 +121,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
if ((*(t_channel_id *)data) != current_channel_id) { if ((*(t_channel_id *)data) != current_channel_id) {
g_InfoViewer->chanready = 0; g_InfoViewer->chanready = 0;
g_Zapit->zapTo_serviceID_NOWAIT(current_channel_id ); g_Zapit->zapTo_serviceID_NOWAIT(current_channel_id );
g_Sectionsd->setServiceChanged(current_channel_id, false); //g_Sectionsd->setServiceChanged(current_channel_id, false);
zap_completion_timeout = getcurrenttime() + 2 * (int64_t) 1000000; zap_completion_timeout = getcurrenttime() + 2 * (int64_t) 1000000;
@@ -168,7 +168,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
director_mode = 0; director_mode = 0;
needs_nvods = (msg == NeutrinoMessages:: EVT_ZAP_ISNVOD); needs_nvods = (msg == NeutrinoMessages:: EVT_ZAP_ISNVOD);
g_Sectionsd->setServiceChanged( current_channel_id, true ); //g_Sectionsd->setServiceChanged( current_channel_id, true );
CNeutrinoApp::getInstance()->channelList->adjustToChannelID(current_channel_id); CNeutrinoApp::getInstance()->channelList->adjustToChannelID(current_channel_id);
if ( g_InfoViewer->is_visible ) if ( g_InfoViewer->is_visible )
g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR , 0 ); g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR , 0 );
@@ -340,6 +340,15 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
return messages_return::handled; return messages_return::handled;
} }
else if (msg == NeutrinoMessages::EVT_TUNE_COMPLETE) {
t_channel_id chid = *(t_channel_id *)data;
printf("CRemoteControl::handleMsg: EVT_TUNE_COMPLETE (%016llx)\n", chid);
if(chid)
g_Sectionsd->setServiceChanged( chid, true );
else
g_Sectionsd->setServiceChanged( current_channel_id, true );
return messages_return::handled;
}
//else if (msg == NeutrinoMessages::EVT_ZAP_FAILED || msg == NeutrinoMessages::EVT_ZAP_SUB_FAILED) //else if (msg == NeutrinoMessages::EVT_ZAP_FAILED || msg == NeutrinoMessages::EVT_ZAP_SUB_FAILED)
//return messages_return::handled; //return messages_return::handled;
else else
@@ -361,12 +370,12 @@ void CRemoteControl::getSubChannels()
//printf("CRemoteControl::getSubChannels linkedServices.size %d\n", linkedServices.size()); //printf("CRemoteControl::getSubChannels linkedServices.size %d\n", linkedServices.size());
for (unsigned int i=0; i< linkedServices.size(); i++) for (unsigned int i=0; i< linkedServices.size(); i++)
{ {
//printf("CRemoteControl::getSubChannels %s\n", linkedServices[i].name.c_str());
subChannels.push_back(CSubService( subChannels.push_back(CSubService(
linkedServices[i].originalNetworkId, linkedServices[i].originalNetworkId,
linkedServices[i].serviceId, linkedServices[i].serviceId,
linkedServices[i].transportStreamId, linkedServices[i].transportStreamId,
linkedServices[i].name)); linkedServices[i].name));
//printf("CRemoteControl::getSubChannels %s: %016llx\n", linkedServices[i].name.c_str(), subChannels[i].getChannelID());
if ((subChannels[i].getChannelID()&0xFFFFFFFFFFFFULL) == (current_channel_id&0xFFFFFFFFFFFFULL)) if ((subChannels[i].getChannelID()&0xFFFFFFFFFFFFULL) == (current_channel_id&0xFFFFFFFFFFFFULL))
selected_subchannel = i; selected_subchannel = i;
} }
@@ -606,7 +615,7 @@ const std::string & CRemoteControl::setSubChannel(const int numSub, const bool f
g_Zapit->zapTo_subServiceID_NOWAIT( current_sub_channel_id ); g_Zapit->zapTo_subServiceID_NOWAIT( current_sub_channel_id );
// Houdini: to restart reading the private EPG when switching to a new option // Houdini: to restart reading the private EPG when switching to a new option
g_Sectionsd->setServiceChanged( current_sub_channel_id , true ); //g_Sectionsd->setServiceChanged( current_sub_channel_id , true );
return subChannels[numSub].subservice_name; return subChannels[numSub].subservice_name;
} }
@@ -686,7 +695,7 @@ void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::s
//dvbsub_pause(true); //dvbsub_pause(true);
CZapit::getInstance()->Abort(); CZapit::getInstance()->Abort();
g_Zapit->zapTo_serviceID_NOWAIT(channel_id); g_Zapit->zapTo_serviceID_NOWAIT(channel_id);
g_Sectionsd->setServiceChanged( current_channel_id, false ); //g_Sectionsd->setServiceChanged( current_channel_id, false );
zap_completion_timeout = now + 2 * (int64_t) 1000000; zap_completion_timeout = now + 2 * (int64_t) 1000000;
g_RCInput->killTimer( current_programm_timer ); g_RCInput->killTimer( current_programm_timer );