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

Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	src/driver/screenshot.cpp
	src/gui/components/cc_frm_footer.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 368c043a54
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)
This commit is contained in:
vanhofen
2017-08-07 17:34:29 +02:00
parent 8f336e9552 01fd3b4e90
commit c3dc7849b9
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/neutrino.cpp
View File

@@ -327,6 +327,22 @@ static SNeutrinoSettings::usermenu_t usermenu_default[] = {
/************************************************************************************** /**************************************************************************************
* CNeutrinoApp - loadSetup, load the application-settings * * CNeutrinoApp - loadSetup, load the application-settings *
**************************************************************************************/ **************************************************************************************/
#if HAVE_TRIPLEDRAGON || HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE
#define DEFAULT_X_START_SD 32
#define DEFAULT_Y_START_SD 26
#define DEFAULT_X_END_SD 694
#define DEFAULT_Y_END_SD 570
#else
#define DEFAULT_X_START_SD 60
#define DEFAULT_Y_START_SD 20
#define DEFAULT_X_END_SD 1220
#define DEFAULT_Y_END_SD 560
#endif
#define DEFAULT_X_START_HD 40 //5
#define DEFAULT_Y_START_HD 25 //5
#define DEFAULT_X_END_HD 1235 //1275
#define DEFAULT_Y_END_HD 690 //715
std::string ttx_font_file = ""; std::string ttx_font_file = "";
@@ -528,8 +544,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.shutdown_count = configfile.getInt32("shutdown_count", 0); g_settings.shutdown_count = configfile.getInt32("shutdown_count", 0);
g_settings.shutdown_min = 0; g_settings.shutdown_min = 0;
if (can_shutdown || cs_get_revision() == 1) //(g_info.hw_caps->can_shutdown || cs_get_revision() == 1) if (g_info.hw_caps->can_shutdown || cs_get_revision() == 1)
g_settings.shutdown_min = configfile.getInt32("shutdown_min", 000); //NI g_settings.shutdown_min = configfile.getInt32("shutdown_min", 000);
g_settings.sleeptimer_min = configfile.getInt32("sleeptimer_min", 0); g_settings.sleeptimer_min = configfile.getInt32("sleeptimer_min", 0);
g_settings.timer_remotebox_ip.clear(); g_settings.timer_remotebox_ip.clear();