mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tuxbox/pu/fb-modules'

Browse Source 
only compile tested ;-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2819e651c3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-02-12 21:29:10 +01:00
parent 223df234c4 2956e6d7f9
commit 416d98504a
45 changed files with 859 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/system/setting_helpers.cpp
View File

@@ -537,7 +537,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");
@@ -576,7 +576,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");
@@ -635,7 +635,7 @@ 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
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];