mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +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
------------------
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
This commit is contained in:
vanhofen
2017-02-12 22:17:17 +01:00
parent 227480877c e97d93f824
commit ba302de46b
46 changed files with 220 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/system/setting_helpers.cpp
View File

@@ -551,7 +551,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
CServiceManager::getInstance()->SatelliteList().clear();
CZapit::getInstance()->LoadSettings();
CZapit::getInstance()->GetConfig(zapitCfg);
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
/* flag file to erase /var partition on factory reset,
will be done by init scripts */
FILE * fp = fopen("/var_init/etc/.reset", "w");
@@ -590,7 +590,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
void CFanControlNotifier::setSpeed(unsigned int speed)
{
printf("FAN Speed %d\n", speed);
#ifndef BOXMODEL_APOLLO
#ifndef BOXMODEL_CS_HD2
int cfd = open("/dev/cs_control", O_RDONLY);
if(cfd < 0) {
perror("Cannot open /dev/cs_control");
@@ -649,7 +649,8 @@ bool CAutoModeNotifier::changeNotify(const neutrino_locale_t /*OptionName*/, voi
i, VIDEOMENU_VIDEOMODE_OPTIONS[i].key, VIDEO_STD_MAX);
continue;
}
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
for(i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_auto_modes[i];
#else
modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_video_modes[i];