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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-12 22:17:17 +01:00
parent 826d527841 b9b5808928
commit afda007d95
46 changed files with 220 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/neutrino.cpp
View File

@@ -1004,7 +1004,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
erg = 2;
}
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
g_settings.brightness = configfile.getInt32("brightness", 0);
g_settings.contrast = configfile.getInt32("contrast", 0);
g_settings.saturation = configfile.getInt32("saturation", 0);
@@ -1579,7 +1579,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32("window_size", g_settings.window_size);
configfile.setInt32("window_width", g_settings.window_width);
configfile.setInt32("window_height", g_settings.window_height);
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
configfile.setInt32("brightness", g_settings.brightness );
configfile.setInt32("contrast", g_settings.contrast );
configfile.setInt32("enable_sd_osd", g_settings.enable_sd_osd );
@@ -4612,7 +4612,7 @@ void stop_daemons(bool stopall, bool for_flash)
CVFD::getInstance()->ShowText("Stop daemons...");
g_settings.epg_scan_mode = CEpgScan::MODE_OFF;
//NI
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
system("/bin/backup_flash.sh"); //don't fork
#endif
my_system(NEUTRINO_ENTER_FLASH_SCRIPT);