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

- rename BOXMODEL_CS => BOXMODEL_CST

Browse Source 
Conflicts:
	data/scripts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/imageinfo_ni.cpp
	src/gui/osd_setup.cpp
	src/gui/update.cpp
	src/gui/update.h
	src/gui/update_menue.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-09-03 22:07:12 +02:00
committed by Thilo Graf
parent d29c98d7d5
commit a9882cdc22
34 changed files with 121 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/neutrino.cpp
View File

@@ -847,7 +847,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
webtvsetup.webtv_xml_auto();
g_settings.webradio_xml_auto = configfile.getInt32("webradio_xml_auto", 1);
g_settings.webradio_xml.clear();
#ifndef BOXMODEL_CS_HD1
#ifndef BOXMODEL_CST_HD1
/*
Coolstream's HD1 generation can't play audiostreams via movieplayer
because of driver- or firmware-issues or so. Not sure.
@@ -1172,7 +1172,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
erg = 2;
}
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
g_settings.brightness = configfile.getInt32("brightness", 0);
g_settings.contrast = configfile.getInt32("contrast", 0);
g_settings.saturation = configfile.getInt32("saturation", 0);
@@ -1953,7 +1953,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_CS_HD2
#ifdef BOXMODEL_CST_HD2
configfile.setInt32("brightness", g_settings.brightness );
configfile.setInt32("contrast", g_settings.contrast );
configfile.setInt32("enable_sd_osd", g_settings.enable_sd_osd );
@@ -5146,6 +5146,10 @@ void stop_daemons(bool stopall, bool for_flash)
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
CVFD::getInstance()->ShowText("Stop daemons...");
g_settings.epg_scan_mode = CEpgScan::MODE_OFF;
//#ifdef BOXMODEL_CST_HD2
// system("/bin/backup_flash.sh"); //don't fork
//#endif
my_system(NEUTRINO_ENTER_FLASH_SCRIPT);
}