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

fix strip g_settings.recording_type from unused stuff

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d6a96fd69
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2021-04-28 23:17:02 +02:00
parent 973201cd0f
commit 43190b46b9
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/neutrino.cpp
View File

@@ -824,8 +824,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.timeshift_hours = configfile.getInt32( "timeshift_hours", 4 ); g_settings.timeshift_hours = configfile.getInt32( "timeshift_hours", 4 );
g_settings.filesystem_is_utf8 = configfile.getBool("filesystem_is_utf8" , true ); g_settings.filesystem_is_utf8 = configfile.getBool("filesystem_is_utf8" , true );
//recording (server + vcr) //recording
g_settings.recording_type = configfile.getInt32("recording_type", RECORDING_FILE); g_settings.recording_type = configfile.getInt32("recording_type", CNeutrinoApp::RECORDING_FILE);
g_settings.recording_stopsectionsd = configfile.getBool("recording_stopsectionsd" , false ); 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_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); 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) if (!erg)
{ {
// fix wrong entry
if (g_settings.version_pseudo == "20213103000000")
g_settings.version_pseudo = "20210331000000";
if (g_settings.version_pseudo < NEUTRINO_VERSION_PSEUDO) if (g_settings.version_pseudo < NEUTRINO_VERSION_PSEUDO)
upgradeSetup(fname); upgradeSetup(fname);
@@ -1460,7 +1464,7 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
g_settings.key_pip_setup = CRCInput::RC_nokey; g_settings.key_pip_setup = CRCInput::RC_nokey;
g_settings.key_pip_swap = CRCInput::RC_next; 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 // 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_0");
configfile.deleteKey("screen_StartY_lcd_1"); 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; g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
configfile.setString("version_pseudo", g_settings.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.setString( "last_webtv_dir", g_settings.last_webtv_dir);
configfile.setBool ("filesystem_is_utf8" , g_settings.filesystem_is_utf8 ); configfile.setBool ("filesystem_is_utf8" , g_settings.filesystem_is_utf8 );
//recording (server + vcr) //recording
configfile.setInt32 ("recording_type", g_settings.recording_type); configfile.setInt32 ("recording_type", g_settings.recording_type);
configfile.setBool ("recording_stopsectionsd" , g_settings.recording_stopsectionsd ); configfile.setBool ("recording_stopsectionsd" , g_settings.recording_stopsectionsd );

2
src/neutrino.h
View File

@@ -68,7 +68,7 @@ public:
enum enum
{ {
RECORDING_OFF = 0, RECORDING_OFF = 0,
RECORDING_FILE RECORDING_FILE = 1
}; };
private: private:

2
version_pseudo.h
View File

@@ -1 +1 @@
#define NEUTRINO_VERSION_PSEUDO "20213103000000" #define NEUTRINO_VERSION_PSEUDO "20212804200000"