mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

TRIPLEDRAGON: deleted

Browse Source 
Origin commit data
------------------
Commit: b4bab59f38
Author: max_10 <max_10@gmx.de>
Date: 2020-10-03 (Sat, 03 Oct 2020)

Origin message was:
------------------
- TRIPLEDRAGON: deleted
This commit is contained in:
max_10
2020-10-03 22:47:34 +02:00
committed by vanhofen
parent 1d416e4660
commit e1e694e6c8
26 changed files with 22 additions and 645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
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
@@ -947,11 +944,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.screen_StartY_lcd_1 = configfile.getInt32("screen_StartY_lcd_1", 45); //NI
g_settings.screen_EndX_lcd_1 = configfile.getInt32("screen_EndX_lcd_1" , 1920 - g_settings.screen_StartX_lcd_1 - 1);
g_settings.screen_EndY_lcd_1 = configfile.getInt32("screen_EndY_lcd_1" , 1080 - g_settings.screen_StartY_lcd_1 - 1);
#if HAVE_TRIPLEDRAGON
g_settings.screen_preset = configfile.getInt32("screen_preset", COsdSetup::PRESET_CRT);
#else
g_settings.screen_preset = configfile.getInt32("screen_preset", COsdSetup::PRESET_LCD);
#endif
setScreenSettings();
// avoid configuration mismatch
@@ -4735,22 +4728,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) {