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

More sub pause/restart

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@174 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-01-17 15:50:07 +00:00
parent 157d631d5b
commit 6d7adc0183
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/neutrino.cpp
View File

@@ -2605,15 +2605,20 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
if( ( mode == mode_tv ) || ( ( mode == mode_radio ) ) ) { if( ( mode == mode_tv ) || ( ( mode == mode_radio ) ) ) {
if( (msg == NeutrinoMessages::SHOW_EPG) /* || (msg == CRCInput::RC_info) */ ) { if( (msg == NeutrinoMessages::SHOW_EPG) /* || (msg == CRCInput::RC_info) */ ) {
//g_EpgData->show( g_Zapit->getCurrentServiceID() ); //g_EpgData->show( g_Zapit->getCurrentServiceID() );
dvbsub_pause();
g_EpgData->show(live_channel_id); g_EpgData->show(live_channel_id);
dvbsub_start(0);
} }
else if( msg == CRCInput::RC_epg ) { else if( msg == CRCInput::RC_epg ) {
dvbsub_pause();
g_EventList->exec(live_channel_id, channelList->getActiveChannelName()); g_EventList->exec(live_channel_id, channelList->getActiveChannelName());
dvbsub_start(0);
} }
else if( msg == CRCInput::RC_text) { else if( msg == CRCInput::RC_text) {
g_RCInput->clearRCMsg(); g_RCInput->clearRCMsg();
if(g_settings.mode_clock) if(g_settings.mode_clock)
InfoClock->StopClock(); InfoClock->StopClock();
dvbsub_pause();
tuxtx_main(g_RCInput->getFileHandle(), frameBuffer->getFrameBufferPointer(), g_RemoteControl->current_PIDs.PIDs.vtxtpid, tuxtx_main(g_RCInput->getFileHandle(), frameBuffer->getFrameBufferPointer(), g_RemoteControl->current_PIDs.PIDs.vtxtpid,
frameBuffer->getScreenX(), frameBuffer->getScreenY(), frameBuffer->getScreenWidth(), frameBuffer->getScreenHeight()); frameBuffer->getScreenX(), frameBuffer->getScreenY(), frameBuffer->getScreenWidth(), frameBuffer->getScreenHeight());
@@ -2625,6 +2630,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
AudioMute(current_muted, true); AudioMute(current_muted, true);
if(g_settings.mode_clock) if(g_settings.mode_clock)
InfoClock->StartClock(); InfoClock->StartClock();
dvbsub_start(0);
} }
else if( msg == CRCInput::RC_setup ) { else if( msg == CRCInput::RC_setup ) {
if(!g_settings.minimode) { if(!g_settings.minimode) {
@@ -2647,10 +2653,12 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
tvMode(); tvMode();
} }
else if( ((msg == CRCInput::RC_tv) || (msg == CRCInput::RC_radio)) && ((neutrino_msg_t)g_settings.key_tvradio_mode == CRCInput::RC_nokey)) { else if( ((msg == CRCInput::RC_tv) || (msg == CRCInput::RC_radio)) && ((neutrino_msg_t)g_settings.key_tvradio_mode == CRCInput::RC_nokey)) {
if(mode == mode_radio ) if(mode == mode_radio ) {
tvMode(); tvMode();
else if(mode == mode_tv) }
else if(mode == mode_tv) {
radioMode(); radioMode();
}
} }
else if( ( msg == (neutrino_msg_t) g_settings.key_quickzap_up ) || ( msg == (neutrino_msg_t) g_settings.key_quickzap_down ) ) else if( ( msg == (neutrino_msg_t) g_settings.key_quickzap_up ) || ( msg == (neutrino_msg_t) g_settings.key_quickzap_down ) )
{ {
@@ -2659,6 +2667,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
} }
else if( msg == (neutrino_msg_t) g_settings.key_subchannel_up ) { else if( msg == (neutrino_msg_t) g_settings.key_subchannel_up ) {
if(g_RemoteControl->subChannels.size() > 0) { if(g_RemoteControl->subChannels.size() > 0) {
dvbsub_pause();
g_RemoteControl->subChannelUp(); g_RemoteControl->subChannelUp();
g_InfoViewer->showSubchan(); g_InfoViewer->showSubchan();
} else } else
@@ -2666,6 +2675,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
} }
else if( msg == (neutrino_msg_t) g_settings.key_subchannel_down ) { else if( msg == (neutrino_msg_t) g_settings.key_subchannel_down ) {
if(g_RemoteControl->subChannels.size()> 0) { if(g_RemoteControl->subChannels.size()> 0) {
dvbsub_pause();
g_RemoteControl->subChannelDown(); g_RemoteControl->subChannelDown();
g_InfoViewer->showSubchan(); g_InfoViewer->showSubchan();
} else } else
@@ -2685,6 +2695,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
} }
else if( msg == (neutrino_msg_t) g_settings.key_lastchannel ) { else if( msg == (neutrino_msg_t) g_settings.key_lastchannel ) {
// Quick Zap // Quick Zap
dvbsub_pause();
channelList->numericZap( msg ); channelList->numericZap( msg );
} }
else if( msg == (neutrino_msg_t) g_settings.key_plugin ) { else if( msg == (neutrino_msg_t) g_settings.key_plugin ) {
@@ -2735,17 +2746,25 @@ printf("[neutrino] direct record\n");
} }
} }
else if( msg == CRCInput::RC_red ) { else if( msg == CRCInput::RC_red ) {
dvbsub_pause();
showUserMenu(SNeutrinoSettings::BUTTON_RED); showUserMenu(SNeutrinoSettings::BUTTON_RED);
dvbsub_start(0);
} }
else if( (msg == CRCInput::RC_green) || ((msg == CRCInput::RC_audio) && !g_settings.audio_run_player) ) else if( (msg == CRCInput::RC_green) || ((msg == CRCInput::RC_audio) && !g_settings.audio_run_player) )
{ {
dvbsub_pause();
showUserMenu(SNeutrinoSettings::BUTTON_GREEN); showUserMenu(SNeutrinoSettings::BUTTON_GREEN);
dvbsub_start(0);
} }
else if( msg == CRCInput::RC_yellow ) { // NVODs else if( msg == CRCInput::RC_yellow ) { // NVODs
dvbsub_pause();
showUserMenu(SNeutrinoSettings::BUTTON_YELLOW); showUserMenu(SNeutrinoSettings::BUTTON_YELLOW);
dvbsub_start(0);
} }
else if( msg == CRCInput::RC_blue ) { else if( msg == CRCInput::RC_blue ) {
dvbsub_pause();
showUserMenu(SNeutrinoSettings::BUTTON_BLUE); showUserMenu(SNeutrinoSettings::BUTTON_BLUE);
dvbsub_start(0);
} }
else if( (msg == CRCInput::RC_audio) && g_settings.audio_run_player) { else if( (msg == CRCInput::RC_audio) && g_settings.audio_run_player) {
dvbsub_pause(); dvbsub_pause();