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

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-08-21 13:13:03 +02:00
parent 0238049daf c307ed5b36
commit 8c45b2eea6
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/hardware/coolstream/hardware_caps.cpp
View File

@@ -39,9 +39,12 @@ hw_caps_t *get_hwcaps(void) {
case 6: case 6:
case 7: // Black Stallion Edition case 7: // Black Stallion Edition
strcpy(caps.boxname, "HD1"); strcpy(caps.boxname, "HD1");
strcpy(caps.boxarch, "Nevis");
caps.force_tuner_2G = 1; caps.force_tuner_2G = 1;
break; break;
case 8:
strcpy(caps.boxname, "Neo"); // see dirty part of hw_caps in neutrino.cpp strcpy(caps.boxname, "Neo"); // see dirty part of hw_caps in neutrino.cpp
strcpy(caps.boxarch, "Nevis");
caps.force_tuner_2G = 1; caps.force_tuner_2G = 1;
break; break;
case 9: case 9:

4
src/neutrino.cpp
View File

@@ -492,7 +492,7 @@ 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 (g_info.hw_caps->can_shutdown || cs_get_revision() == 1) if (g_info.hw_caps->can_shutdown)
g_settings.shutdown_min = configfile.getInt32("shutdown_min", 180); g_settings.shutdown_min = configfile.getInt32("shutdown_min", 180);
g_settings.sleeptimer_min = configfile.getInt32("sleeptimer_min", 0); g_settings.sleeptimer_min = configfile.getInt32("sleeptimer_min", 0);
@@ -2197,7 +2197,7 @@ TIMER_START();
cs_new_auto_videosystem(); cs_new_auto_videosystem();
#endif #endif
g_info.hw_caps = get_hwcaps(); g_info.hw_caps = get_hwcaps();
g_Locale = new CLocaleManager; g_Locale = new CLocaleManager;