From 43190b46b9e69157ca3ee9bcd22278ce7f78fdf0 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 28 Apr 2021 23:17:02 +0200 Subject: [PATCH] fix strip g_settings.recording_type from unused stuff Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5d6a96fd694ee6911758c8a72cf617daa75c0b17 Author: vanhofen Date: 2021-04-28 (Wed, 28 Apr 2021) Origin message was: ------------------ - fix strip g_settings.recording_type from unused stuff ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 16 ++++++++++++---- src/neutrino.h | 2 +- version_pseudo.h | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 23f7b2e7b..b699bb7fb 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -824,8 +824,8 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.timeshift_hours = configfile.getInt32( "timeshift_hours", 4 ); g_settings.filesystem_is_utf8 = configfile.getBool("filesystem_is_utf8" , true ); - //recording (server + vcr) - g_settings.recording_type = configfile.getInt32("recording_type", RECORDING_FILE); + //recording + g_settings.recording_type = configfile.getInt32("recording_type", CNeutrinoApp::RECORDING_FILE); g_settings.recording_stopsectionsd = configfile.getBool("recording_stopsectionsd" , false ); g_settings.recording_audio_pids_default = configfile.getInt32("recording_audio_pids_default", TIMERD_APIDS_STD | TIMERD_APIDS_AC3); g_settings.recording_zap_on_announce = configfile.getBool("recording_zap_on_announce" , false); @@ -1241,6 +1241,10 @@ int CNeutrinoApp::loadSetup(const char * fname) if (!erg) { + // fix wrong entry + if (g_settings.version_pseudo == "20213103000000") + g_settings.version_pseudo = "20210331000000"; + if (g_settings.version_pseudo < NEUTRINO_VERSION_PSEUDO) upgradeSetup(fname); @@ -1460,7 +1464,7 @@ void CNeutrinoApp::upgradeSetup(const char * fname) g_settings.key_pip_setup = CRCInput::RC_nokey; g_settings.key_pip_swap = CRCInput::RC_next; } - if (g_settings.version_pseudo < "20213103000000") + if (g_settings.version_pseudo < "20210331000000") { // switch g_settings.screen_preset /* @@ -1486,6 +1490,10 @@ void CNeutrinoApp::upgradeSetup(const char * fname) configfile.deleteKey("screen_StartY_lcd_0"); configfile.deleteKey("screen_StartY_lcd_1"); } + if (g_settings.version_pseudo < "20210428200000") + { + g_settings.recording_type = CNeutrinoApp::RECORDING_FILE; + } g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO; configfile.setString("version_pseudo", g_settings.version_pseudo); @@ -1811,7 +1819,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setString( "last_webtv_dir", g_settings.last_webtv_dir); configfile.setBool ("filesystem_is_utf8" , g_settings.filesystem_is_utf8 ); - //recording (server + vcr) + //recording configfile.setInt32 ("recording_type", g_settings.recording_type); configfile.setBool ("recording_stopsectionsd" , g_settings.recording_stopsectionsd ); diff --git a/src/neutrino.h b/src/neutrino.h index abda083ed..64d050ab4 100644 --- a/src/neutrino.h +++ b/src/neutrino.h @@ -68,7 +68,7 @@ public: enum { RECORDING_OFF = 0, - RECORDING_FILE + RECORDING_FILE = 1 }; private: diff --git a/version_pseudo.h b/version_pseudo.h index 071c07070..eb1bfbd84 100644 --- a/version_pseudo.h +++ b/version_pseudo.h @@ -1 +1 @@ -#define NEUTRINO_VERSION_PSEUDO "20213103000000" +#define NEUTRINO_VERSION_PSEUDO "20212804200000"