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

rework VUPLUS defines

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: e299801f1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-06-12 (Fri, 12 Jun 2020)

Origin message was:
------------------
- rework VUPLUS defines

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-06-12 22:27:13 +02:00
parent e3d2e27d76
commit 9b6e6bea2f
13 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/neutrino.cpp
View File

@@ -481,7 +481,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.ci_tuner = configfile.getInt32("ci_tuner", -1);
g_settings.ci_rec_zapto = configfile.getInt32("ci_rec_zapto", 0);
g_settings.ci_mode = configfile.getInt32("ci_mode", 0);
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
g_settings.ci_delay = configfile.getInt32("ci_delay", 128);
#endif
// ci-settings for each slot
@@ -507,7 +507,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
#else
g_settings.ci_clock[i] = configfile.getInt32(cfg_key, 9);
#endif
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
sprintf(cfg_key, "ci_rpr_%d", i);
g_settings.ci_rpr[i] = configfile.getInt32(cfg_key, 9);
#endif
@@ -1504,7 +1504,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32("ci_tuner", g_settings.ci_tuner);
configfile.setInt32("ci_rec_zapto", g_settings.ci_rec_zapto);
configfile.setInt32("ci_mode", g_settings.ci_mode);
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
configfile.setInt32("ci_delay", g_settings.ci_delay);
#endif
// ci-settings for each slot
@@ -1517,7 +1517,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
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
#if BOXMODEL_VUPLUS_ALL
sprintf(cfg_key, "ci_rpr_%d", i);
configfile.setInt32(cfg_key, g_settings.ci_rpr[i]);
#endif
@@ -2779,7 +2779,7 @@ TIMER_START();
ZapStart_arg.uselastchannel = g_settings.uselastchannel;
ZapStart_arg.video_mode = g_settings.video_Mode;
memcpy(ZapStart_arg.ci_clock, g_settings.ci_clock, sizeof(g_settings.ci_clock));
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
ZapStart_arg.ci_delay = g_settings.ci_delay;
memcpy(ZapStart_arg.ci_rpr, g_settings.ci_rpr, sizeof(g_settings.ci_rpr));
#endif
@@ -5425,7 +5425,7 @@ void CNeutrinoApp::loadKeys(const char * fname)
g_settings.key_list_end = tconfig->getInt32( "key_list_end", (unsigned int)CRCInput::RC_nokey );
#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_nokey ); // FIXME
#elif BOXMODEL_VUPLUS
#elif BOXMODEL_VUPLUS_ALL
g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_playpause );
#else
g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_pause );
@@ -5461,7 +5461,7 @@ void CNeutrinoApp::loadKeys(const char * fname)
#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7
g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_playpause );
g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause );
#elif BOXMODEL_VUPLUS
#elif BOXMODEL_VUPLUS_ALL
g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_play );
g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause );
#else
@@ -5966,7 +5966,7 @@ static struct __key_rename key_rename[] = {
{ "ci_save_pincode", "ci_save_pincode_0" },
{ "ci_pincode", "ci_pincode_0" },
{ "ci_ignore_messages", "ci_ignore_messages_0" },
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
{ "ci_rpr", "ci_rpr_0" },
#endif
{ NULL, NULL }