mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-11-17 00:52:38 -05:00
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
This commit is contained in:
parent
440083af87
commit
2509def164
14 changed files with 107 additions and 114 deletions
|
|
@ -381,12 +381,12 @@ QString Utils::checkEnvironment(bool permission)
|
|||
RockboxInfo rbinfo(RbSettings::value(RbSettings::Mountpoint).toString());
|
||||
QString installed = rbinfo.target();
|
||||
if(!installed.isEmpty() && installed !=
|
||||
SystemInfo::value(SystemInfo::CurConfigureModel).toString())
|
||||
SystemInfo::platformValue(SystemInfo::CurConfigureModel).toString())
|
||||
{
|
||||
text += tr("<li>Target mismatch detected.<br/>"
|
||||
"Installed target: %1<br/>Selected target: %2.</li>")
|
||||
.arg(SystemInfo::platformValue(installed, SystemInfo::CurPlatformName).toString(),
|
||||
SystemInfo::value(SystemInfo::CurPlatformName).toString());
|
||||
.arg(SystemInfo::platformValue(SystemInfo::CurPlatformName, installed).toString(),
|
||||
SystemInfo::platformValue(SystemInfo::CurPlatformName).toString());
|
||||
}
|
||||
|
||||
if(!text.isEmpty())
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue