diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-14 16:23:56 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-14 16:42:29 +0100 |
commit | 2509def164ee7f4aecbe6a786df57140f19e35f2 (patch) | |
tree | 63a7396e1b94482f9f05c3f3abf6c7cd77e10d26 /rbutil/rbutilqt/base/systeminfo.cpp | |
parent | 440083af872da43c116c5374d8e1511cef65abf2 (diff) | |
download | rockbox-2509def164ee7f4aecbe6a786df57140f19e35f2.tar.gz rockbox-2509def164ee7f4aecbe6a786df57140f19e35f2.zip |
rbutil: Rework player configuration.
- Split internal configuration into player specific and common parts.
Always require passing the player for player specific data instead of
implicitly assuming the currently selected one; only use the currently
selected one if the player name is explicitly passed as empty.
- Similarly adjust handling of server info data; prepare for splitting
into build type specific values so the naming becomes cleaner.
Change-Id: I894e694f83bd9fe2d22ad46b3f8f7df3e2c68033
Diffstat (limited to 'rbutil/rbutilqt/base/systeminfo.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp index d57c12a62b..c9e29a8325 100644 --- a/rbutil/rbutilqt/base/systeminfo.cpp +++ b/rbutil/rbutilqt/base/systeminfo.cpp | |||
@@ -49,6 +49,13 @@ const static struct { | |||
49 | { SystemInfo::ThemesUrl, "themes_url", "" }, | 49 | { SystemInfo::ThemesUrl, "themes_url", "" }, |
50 | { SystemInfo::ThemesInfoUrl, "themes_info_url", "" }, | 50 | { SystemInfo::ThemesInfoUrl, "themes_info_url", "" }, |
51 | { SystemInfo::RbutilUrl, "rbutil_url", "" }, | 51 | { SystemInfo::RbutilUrl, "rbutil_url", "" }, |
52 | }; | ||
53 | |||
54 | const static struct { | ||
55 | SystemInfo::PlatformInfo info; | ||
56 | const char* name; | ||
57 | const char* def; | ||
58 | } PlatformInfosList[] = { | ||
52 | { SystemInfo::CurPlatformName, ":platform:/name", "" }, | 59 | { SystemInfo::CurPlatformName, ":platform:/name", "" }, |
53 | { SystemInfo::CurManual, ":platform:/manualname","rockbox-:platform:" }, | 60 | { SystemInfo::CurManual, ":platform:/manualname","rockbox-:platform:" }, |
54 | { SystemInfo::CurBootloaderMethod, ":platform:/bootloadermethod", "none" }, | 61 | { SystemInfo::CurBootloaderMethod, ":platform:/bootloadermethod", "none" }, |
@@ -85,27 +92,27 @@ QVariant SystemInfo::value(enum SystemInfos info) | |||
85 | int i = 0; | 92 | int i = 0; |
86 | while(SystemInfosList[i].info != info) | 93 | while(SystemInfosList[i].info != info) |
87 | i++; | 94 | i++; |
88 | QString platform = RbSettings::value(RbSettings::CurrentPlatform).toString(); | ||
89 | QString s = SystemInfosList[i].name; | 95 | QString s = SystemInfosList[i].name; |
90 | s.replace(":platform:", platform); | ||
91 | QString d = SystemInfosList[i].def; | 96 | QString d = SystemInfosList[i].def; |
92 | d.replace(":platform:", platform); | ||
93 | LOG_INFO() << "GET:" << s << systemInfos->value(s, d).toString(); | 97 | LOG_INFO() << "GET:" << s << systemInfos->value(s, d).toString(); |
94 | return systemInfos->value(s, d); | 98 | return systemInfos->value(s, d); |
95 | } | 99 | } |
96 | 100 | ||
97 | QVariant SystemInfo::platformValue(QString platform, enum SystemInfos info) | 101 | QVariant SystemInfo::platformValue(enum PlatformInfo info, QString platform) |
98 | { | 102 | { |
99 | ensureSystemInfoExists(); | 103 | ensureSystemInfoExists(); |
100 | 104 | ||
101 | // locate setting item | 105 | // locate setting item |
102 | int i = 0; | 106 | int i = 0; |
103 | while(SystemInfosList[i].info != info) | 107 | while(PlatformInfosList[i].info != info) |
104 | i++; | 108 | i++; |
105 | 109 | ||
106 | QString s = SystemInfosList[i].name; | 110 | if (platform.isEmpty()) |
111 | platform = RbSettings::value(RbSettings::CurrentPlatform).toString(); | ||
112 | |||
113 | QString s = PlatformInfosList[i].name; | ||
107 | s.replace(":platform:", platform); | 114 | s.replace(":platform:", platform); |
108 | QString d = SystemInfosList[i].def; | 115 | QString d = PlatformInfosList[i].def; |
109 | d.replace(":platform:", platform); | 116 | d.replace(":platform:", platform); |
110 | LOG_INFO() << "GET P:" << s << systemInfos->value(s, d).toString(); | 117 | LOG_INFO() << "GET P:" << s << systemInfos->value(s, d).toString(); |
111 | return systemInfos->value(s, d); | 118 | return systemInfos->value(s, d); |