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

neutrino: revert by mistake commited changes

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d8159a325
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-01-25 (Sat, 25 Jan 2020)

Origin message was:
------------------
- neutrino: revert by mistake commited changes

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-01-25 22:55:38 +01:00
parent 4c878be27b
commit a9df8000de
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/neutrino.cpp
View File

@@ -482,8 +482,25 @@ int CNeutrinoApp::loadSetup(const char * fname)
#endif
g_settings.ci_standby_reset = configfile.getInt32("ci_standby_reset", 0);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
for (unsigned int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
sprintf(cfg_key, "ci_clock_%d", i);
g_settings.ci_clock[i] = configfile.getInt32(cfg_key, 6);
}
#else
for (unsigned int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
sprintf(cfg_key, "ci_clock_%d", i);
g_settings.ci_clock[i] = configfile.getInt32(cfg_key, 9);
}
#endif
#if BOXMODEL_VUPLUS
g_settings.ci_delay = configfile.getInt32("ci_delay", 256);
for (unsigned int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
sprintf(cfg_key, "ci_rpr_%d", i);
g_settings.ci_rpr[i] = configfile.getInt32(cfg_key, 9);
}
#endif
for (unsigned int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
sprintf(cfg_key, "ci_ignore_messages_%d", i);
@@ -492,16 +509,6 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.ci_save_pincode[i] = configfile.getInt32(cfg_key, 0);
sprintf(cfg_key, "ci_pincode_%d", i);
g_settings.ci_pincode[i] = configfile.getString(cfg_key, "");
sprintf(cfg_key, "ci_clock_%d", i);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
g_settings.ci_clock[i] = configfile.getInt32(cfg_key, 6);
#else
g_settings.ci_clock[i] = configfile.getInt32(cfg_key, 9);
#endif
#if BOXMODEL_VUPLUS
sprintf(cfg_key, "ci_rpr_%d", i);
g_settings.ci_rpr[i] = configfile.getInt32(cfg_key, 9);
#endif
}
g_settings.ci_check_live = configfile.getInt32("ci_check_live", 0);
g_settings.ci_tuner = configfile.getInt32("ci_tuner", -1);
@@ -1488,8 +1495,17 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32( "standby_cpufreq", g_settings.standby_cpufreq);
configfile.setInt32("ci_standby_reset", g_settings.ci_standby_reset);
for (unsigned int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
sprintf(cfg_key, "ci_clock_%d", i);
configfile.setInt32(cfg_key, g_settings.ci_clock[i]);
}
#if BOXMODEL_VUPLUS
configfile.setInt32("ci_delay", g_settings.ci_delay);
for (unsigned int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
sprintf(cfg_key, "ci_rpr_%d", i);
configfile.setInt32(cfg_key, g_settings.ci_rpr[i]);
}
#endif
for (unsigned int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
sprintf(cfg_key, "ci_ignore_messages_%d", i);
@@ -1498,12 +1514,6 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32(cfg_key, g_settings.ci_save_pincode[i]);
sprintf(cfg_key, "ci_pincode_%d", i);
configfile.setString(cfg_key, g_settings.ci_pincode[i]);
sprintf(cfg_key, "ci_clock_%d", i);
configfile.setInt32(cfg_key, g_settings.ci_clock[i]);
#if BOXMODEL_VUPLUS
sprintf(cfg_key, "ci_rpr_%d", i);
configfile.setInt32(cfg_key, g_settings.ci_rpr[i]);
#endif
}
configfile.setInt32("ci_check_live", g_settings.ci_check_live);