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

neutrino.cpp: register CZapitClient::EVT_TUNE_COMPLETE;

Browse Source 
send full channel id with Sectionsd->setServiceChanged - mask will be done in sectionsd.cpp
This commit is contained in:
[CST] Focus
2012-02-19 14:17:46 +04:00
parent ff1e40d684
commit 1af6f79d2c
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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 &0xFFFFFFFFFFFFULL, 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&0xFFFFFFFFFFFFULL, 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 );
@@ -321,11 +321,11 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
{ {
getNVODs(); getNVODs();
if (subChannels.empty()) if (subChannels.empty())
g_Sectionsd->setServiceChanged( current_channel_id&0xFFFFFFFFFFFFULL, true ); g_Sectionsd->setServiceChanged( current_channel_id, true );
} }
else else
// EVENT anfordern! // EVENT anfordern!
g_Sectionsd->setServiceChanged( current_channel_id&0xFFFFFFFFFFFFULL, true ); g_Sectionsd->setServiceChanged( current_channel_id, true );
} }
return messages_return::handled; return messages_return::handled;
@@ -686,7 +686,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&0xFFFFFFFFFFFFULL, 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 );

2
src/gui/infoviewer.cpp
View File

@@ -800,7 +800,7 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
showLcdPercentOver (); showLcdPercentOver ();
if ((g_RemoteControl->current_channel_id == channel_id) && !(((info_CurrentNext.flags & CSectionsdClient::epgflags::has_next) && (info_CurrentNext.flags & (CSectionsdClient::epgflags::has_current | CSectionsdClient::epgflags::has_no_current))) || (info_CurrentNext.flags & CSectionsdClient::epgflags::not_broadcast))) { if ((g_RemoteControl->current_channel_id == channel_id) && !(((info_CurrentNext.flags & CSectionsdClient::epgflags::has_next) && (info_CurrentNext.flags & (CSectionsdClient::epgflags::has_current | CSectionsdClient::epgflags::has_no_current))) || (info_CurrentNext.flags & CSectionsdClient::epgflags::not_broadcast))) {
g_Sectionsd->setServiceChanged (channel_id & 0xFFFFFFFFFFFFULL, true); g_Sectionsd->setServiceChanged (channel_id, true);
} }
// Radiotext // Radiotext

9
src/neutrino.cpp
View File

@@ -1592,7 +1592,7 @@ void CNeutrinoApp::InitZapper()
channelList->adjustToChannelID(live_channel_id); channelList->adjustToChannelID(live_channel_id);
CVFD::getInstance ()->showServicename(channelList->getActiveChannelName()); CVFD::getInstance ()->showServicename(channelList->getActiveChannelName());
g_Sectionsd->setPauseScanning(false); g_Sectionsd->setPauseScanning(false);
g_Sectionsd->setServiceChanged(live_channel_id&0xFFFFFFFFFFFFULL, true ); g_Sectionsd->setServiceChanged(live_channel_id, true );
g_Zapit->getPIDS(g_RemoteControl->current_PIDs); g_Zapit->getPIDS(g_RemoteControl->current_PIDs);
if(g_settings.cacheTXT) if(g_settings.cacheTXT)
if(g_RemoteControl->current_PIDs.PIDs.vtxtpid != 0) if(g_RemoteControl->current_PIDs.PIDs.vtxtpid != 0)
@@ -1798,7 +1798,7 @@ int CNeutrinoApp::run(int argc, char **argv)
g_Sectionsd->registerEvent(CSectionsdClient::EVT_BOUQUETS_UPDATE, 222, NEUTRINO_UDS_NAME); g_Sectionsd->registerEvent(CSectionsdClient::EVT_BOUQUETS_UPDATE, 222, NEUTRINO_UDS_NAME);
g_Sectionsd->registerEvent(CSectionsdClient::EVT_WRITE_SI_FINISHED, 222, NEUTRINO_UDS_NAME); g_Sectionsd->registerEvent(CSectionsdClient::EVT_WRITE_SI_FINISHED, 222, NEUTRINO_UDS_NAME);
#define ZAPIT_EVENT_COUNT 30 #define ZAPIT_EVENT_COUNT 31
const CZapitClient::events zapit_event[ZAPIT_EVENT_COUNT] = const CZapitClient::events zapit_event[ZAPIT_EVENT_COUNT] =
{ {
CZapitClient::EVT_ZAP_COMPLETE, CZapitClient::EVT_ZAP_COMPLETE,
@@ -1830,7 +1830,8 @@ int CNeutrinoApp::run(int argc, char **argv)
CZapitClient::EVT_SCAN_FOUND_RADIO_CHAN, CZapitClient::EVT_SCAN_FOUND_RADIO_CHAN,
CZapitClient::EVT_SCAN_FOUND_DATA_CHAN, CZapitClient::EVT_SCAN_FOUND_DATA_CHAN,
CZapitClient::EVT_SDT_CHANGED, CZapitClient::EVT_SDT_CHANGED,
CZapitClient::EVT_PMT_CHANGED CZapitClient::EVT_PMT_CHANGED,
CZapitClient::EVT_TUNE_COMPLETE,
}; };
for (int i = 0; i < ZAPIT_EVENT_COUNT; i++) for (int i = 0; i < ZAPIT_EVENT_COUNT; i++)
@@ -3433,7 +3434,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff )
videoDecoder->Standby(false); videoDecoder->Standby(false);
g_Sectionsd->setPauseScanning(false); g_Sectionsd->setPauseScanning(false);
g_Sectionsd->setServiceChanged(live_channel_id&0xFFFFFFFFFFFFULL, true ); g_Sectionsd->setServiceChanged(live_channel_id, true );
if(g_settings.mode_clock) if(g_settings.mode_clock)
InfoClock->StartClock(); InfoClock->StartClock();

4
src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
View File

@@ -183,7 +183,7 @@ void CNeutrinoAPI::ZapToChannelId(t_channel_id channel_id)
} }
if (Zapit->zapTo_serviceID(channel_id) != CZapitClient::ZAP_INVALID_PARAM) if (Zapit->zapTo_serviceID(channel_id) != CZapitClient::ZAP_INVALID_PARAM)
Sectionsd->setServiceChanged(channel_id&0xFFFFFFFFFFFFULL, false); Sectionsd->setServiceChanged(channel_id, false);
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
@@ -196,7 +196,7 @@ void CNeutrinoAPI::ZapToSubService(const char * const target)
&channel_id); &channel_id);
if (Zapit->zapTo_subServiceID(channel_id) != CZapitClient::ZAP_INVALID_PARAM) if (Zapit->zapTo_subServiceID(channel_id) != CZapitClient::ZAP_INVALID_PARAM)
Sectionsd->setServiceChanged(channel_id&0xFFFFFFFFFFFFULL, false); Sectionsd->setServiceChanged(channel_id, false);
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
t_channel_id CNeutrinoAPI::ChannelNameToChannelId(std::string search_channel_name) t_channel_id CNeutrinoAPI::ChannelNameToChannelId(std::string search_channel_name)