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

- TRIPLEDRAGON: deleted

Browse Source 
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	src/system/flashtool.cpp
This commit is contained in:
max_10
2020-10-03 22:47:34 +02:00
committed by Thilo Graf
parent fa91372706
commit 1fa824cab3
26 changed files with 22 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/neutrino.cpp
View File

@@ -400,13 +400,10 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.softupdate_autocheck = configfile.getBool("softupdate_autocheck" , false);
// video
#if HAVE_TRIPLEDRAGON
int vid_Mode_default = VIDEO_STD_PAL;
#else
int vid_Mode_default = VIDEO_STD_720P50;
if (getenv("NEUTRINO_DEFAULT_SCART") != NULL)
vid_Mode_default = VIDEO_STD_PAL;
#endif
g_settings.video_Mode = configfile.getInt32("video_Mode", vid_Mode_default);
#ifdef ANALOG_MODE
g_settings.analog_mode1 = configfile.getInt32("analog_mode1", (int)ANALOG_MODE(BOTH,SD,RGB)); // default RGB
@@ -4653,22 +4650,12 @@ 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 = NeutrinoModes::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 = NeutrinoModes::mode_unknown;
//re-set mode
if( lastMode == NeutrinoModes::mode_radio || lastMode == NeutrinoModes::mode_webradio) {