From dfab53b2b61ac4b8a5192a97eefc342d355f3cf1 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 19 Sep 2010 17:54:56 +0200 Subject: [PATCH] neutrino: let the "AUX" key switch to SCART input on TD Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/67e7915bf258f5a87a3b7cb72243ff64f26ee8f5 Author: Stefan Seyfried Date: 2010-09-19 (Sun, 19 Sep 2010) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index dc3fea1c7..dbe4f7ae4 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2154,6 +2154,8 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) CTimerList Timerlist; Timerlist.exec(NULL, ""); } + else if (msg == CRCInput::RC_aux) + scartMode(true); else { if (msg == CRCInput::RC_home) { if(g_settings.mode_clock && g_settings.key_zaphistory == CRCInput::RC_home) { @@ -2167,7 +2169,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) } else { // mode == mode_scart - if( msg == CRCInput::RC_home ) { + if (msg == CRCInput::RC_home || msg == CRCInput::RC_aux) { if( mode == mode_scart ) { // Scart-Mode verlassen scartMode( false ); @@ -3126,13 +3128,22 @@ void CNeutrinoApp::scartMode( bool bOnOff ) frameBuffer->paintBackground(); //g_Controld->setScartMode( 1 ); +#if HAVE_TRIPLEDRAGON + /* would this hurt on Coolstream? */ + videoDecoder->Stop(true); + videoDecoder->Standby(true); +#endif CVFD::getInstance()->setMode(CVFD::MODE_SCART); lastMode = mode; mode = mode_scart; } else { // SCART AUS //g_Controld->setScartMode( 0 ); - +#if HAVE_TRIPLEDRAGON + /* could actually go into radioMode() and tvMode()? */ + videoDecoder->Standby(false); + videoDecoder->Start(); +#endif mode = mode_unknown; //re-set mode if( lastMode == mode_radio ) {