mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-09 13:15:18 -05:00
rbutil: Rework and merge player and build server info handling.
Handling the data for players from rbutil.ini and the build-info data from the server is closely related. Splitting things up into different classes only creates tightly coupling, which is unnecessary, and the need to differentiate between them in the application. Merge both classes into a single one and rework handling so the application doesn't have to deal with two separate classes anymore. Furthermore, change URL templates to use new values from build-info instead of hard coding them. Change-Id: Ica550973ce23d1559110782add52bc214eba552d
This commit is contained in:
parent
78a01db47c
commit
b064a6cbb5
24 changed files with 791 additions and 773 deletions
|
|
@ -23,7 +23,7 @@
|
|||
#include "utils.h"
|
||||
#include "system.h"
|
||||
#include "rbsettings.h"
|
||||
#include "systeminfo.h"
|
||||
#include "playerbuildinfo.h"
|
||||
|
||||
#include "../mks5lboot/mks5lboot.h"
|
||||
|
||||
|
|
@ -408,8 +408,8 @@ BootloaderInstallBase::BootloaderType BootloaderInstallS5l::installed(void)
|
|||
QString logfile = RbSettings::value(RbSettings::Mountpoint).toString()
|
||||
+ "/.rockbox/rbutil.log";
|
||||
QSettings s(logfile, QSettings::IniFormat, this);
|
||||
QString section = SystemInfo::platformValue(
|
||||
SystemInfo::BootloaderName).toString().section('/', -1);
|
||||
QString section = PlayerBuildInfo::instance()->value(
|
||||
PlayerBuildInfo::BootloaderName).toString().section('/', -1);
|
||||
rbblInstalled = s.contains("Bootloader/" + section);
|
||||
|
||||
if (rbblInstalled) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue