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

neutrino/zapit: don't start video when leaving standby

Browse Source 
Parental handling was defeated because zapit did start video before
a check for lockstatus could be done.
Fix this by:
* not zapping to the current channel in leaveStandby() in zapit
* explicitly zapping during start and after leaving standby from
  neutrino

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1263 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2011-03-06 16:35:17 +00:00
parent f21df6067d
commit 3aa7e2f854
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/neutrino.cpp
View File

@@ -1980,11 +1980,11 @@ void CNeutrinoApp::InitZapper()
channelsInit(); channelsInit();
if(firstchannel.mode == 't') { if(firstchannel.mode == 't') {
tvMode(false); tvMode(true);
} else { } else {
g_RCInput->killTimer(g_InfoViewer->lcdUpdateTimer); g_RCInput->killTimer(g_InfoViewer->lcdUpdateTimer);
g_InfoViewer->lcdUpdateTimer = g_RCInput->addTimer( LCD_UPDATE_TIME_RADIO_MODE, false ); g_InfoViewer->lcdUpdateTimer = g_RCInput->addTimer( LCD_UPDATE_TIME_RADIO_MODE, false );
radioMode(false); radioMode(true);
} }
if(g_settings.cacheTXT) if(g_settings.cacheTXT)
tuxtxt_init(); tuxtxt_init();
@@ -3985,6 +3985,10 @@ void CNeutrinoApp::standbyMode( bool bOnOff )
g_Zapit->setStandby(false); g_Zapit->setStandby(false);
if(was_record) if(was_record)
g_Zapit->startPlayBack(); g_Zapit->startPlayBack();
else {
channelList->setSelected(0xfffffff); /* make sure that zapTo_ChannelID will zap */
channelList->zapTo_ChannelID(live_channel_id);
}
if(recordingstatus) was_record = 0; if(recordingstatus) was_record = 0;
videoDecoder->Standby(false); videoDecoder->Standby(false);

5
src/zapit/src/zapit.cpp
View File

@@ -404,6 +404,7 @@ printf("[zapit] saving channel, apid %x sub pid %x mode %d volume %d\n", g_curre
audio_map[g_current_channel->getChannelID()].volume = audioDecoder->getVolume(); audio_map[g_current_channel->getChannelID()].volume = audioDecoder->getVolume();
audio_map[g_current_channel->getChannelID()].subpid = dvbsub_getpid(); audio_map[g_current_channel->getChannelID()].subpid = dvbsub_getpid();
tuxtx_subtitle_running(&audio_map[g_current_channel->getChannelID()].ttxpid, &audio_map[g_current_channel->getChannelID()].ttxpage, NULL); tuxtx_subtitle_running(&audio_map[g_current_channel->getChannelID()].ttxpid, &audio_map[g_current_channel->getChannelID()].ttxpage, NULL);
firstzap = false;
} }
if (in_nvod) { if (in_nvod) {
@@ -2087,8 +2088,10 @@ void leaveStandby(void)
} }
standby = false; standby = false;
#if 0
if (g_current_channel) if (g_current_channel)
zapit(live_channel_id, current_is_nvod, false, true); zapit(live_channel_id, current_is_nvod, false, true);
#endif
} }
unsigned zapTo(const unsigned int bouquet, const unsigned int pchannel) unsigned zapTo(const unsigned int bouquet, const unsigned int pchannel)
@@ -2264,7 +2267,7 @@ int zapit_main_thread(void *data)
// sleep(1) is ok here. (striper) // sleep(1) is ok here. (striper)
sleep(1); sleep(1);
leaveStandby(); leaveStandby();
firstzap = false; //firstzap = false;
stime = time(0); stime = time(0);
//time_t curtime; //time_t curtime;
pthread_create (&tsdt, NULL, sdt_thread, (void *) NULL); pthread_create (&tsdt, NULL, sdt_thread, (void *) NULL);