mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- migrate users settings; screen_StartX_crt/lcd -> screen_StartX_crt/lcd_0

Browse Source
This commit is contained in:
svenhoefer
2017-02-13 21:21:11 +01:00
parent 7b158903f8
commit 9792b47666
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/neutrino.cpp
View File

@@ -4895,11 +4895,7 @@ bool CNeutrinoApp::adjustToChannelID(const t_channel_id channel_id)
} }
/* /*
* commit 523b273a changed the names of config file entries: * convert config keys, so that users do not need to set up their system again
* casystem_display => infobar_casystem_display
* casystem_dotmatrix => infobar_casystem_dotmatrix
* casystem_frame => infobar_casystem_frame
* convert these, so that users do not need to set up their system again
*/ */
struct __key_rename { struct __key_rename {
const char *from; const char *from;
@@ -4910,6 +4906,14 @@ static struct __key_rename key_rename[] = {
{ "casystem_display", "infobar_casystem_display" }, { "casystem_display", "infobar_casystem_display" },
{ "casystem_dotmatrix", "infobar_casystem_dotmatrix"}, { "casystem_dotmatrix", "infobar_casystem_dotmatrix"},
{ "casystem_frame", "infobar_casystem_frame" }, { "casystem_frame", "infobar_casystem_frame" },
{ "screen_StartX_crt", "screen_StartX_crt_0" },
{ "screen_StartY_crt", "screen_StartY_crt_0" },
{ "screen_EndX_crt", "screen_EndX_crt_0" },
{ "screen_EndY_crt", "screen_EndY_crt_0" },
{ "screen_StartX_lcd", "screen_StartX_lcd_0" },
{ "screen_StartY_lcd", "screen_StartY_lcd_0" },
{ "screen_EndX_lcd", "screen_EndX_lcd_0" },
{ "screen_EndY_lcd", "screen_EndY_lcd_0" },
{ NULL, NULL } { NULL, NULL }
}; };
@@ -4932,9 +4936,8 @@ void CNeutrinoApp::migrateConfig(const char *fname)
/* only set new key to old value if the new key does not yet exist */ /* only set new key to old value if the new key does not yet exist */
if (configfile.getInt32(to, magic) == magic) if (configfile.getInt32(to, magic) == magic)
configfile.setInt32(to, tmp); configfile.setInt32(to, tmp);
/* always remove old key*/ /* always remove old key */
configfile.deleteKey(from); configfile.deleteKey(from);
} }
/* more complex migration, including converting values etc. could be done here */ /* more complex migration, including converting values etc. could be done here */
} }