rbutilqt: Clarify if a setting comes from rbutil.ini or build-info

rockbox-gerrit-noreply--- via rockbox-cvs <[email protected]> Sat, 20 Jun 2026 12:57:12 -0400
Newsgroups gmane.comp.systems.archos.rockbox.cvs
Message-ID <[email protected]>
commit 005826b630426c623cbe0953506ff8618bc47ace
Author: Vencislav Atanasov <[email protected]>
Date:   Sat Jun 20 18:31:51 2026 +0300

    rbutilqt: Clarify if a setting comes from rbutil.ini or build-info
    
    Also implement a fast path for QVariant PlayerBuildInfo::value(BuildInfo item)
    
    Change-Id: Ice4e2dfbf9d7e3ba2e0f6692c320d50e3918b0d4

diff --git a/utils/rbutilqt/base/playerbuildinfo.cpp b/utils/rbutilqt/base/playerbuildinfo.cpp
index 4567e3d59d..bb0e469d9d 100644
--- a/utils/rbutilqt/base/playerbuildinfo.cpp
+++ b/utils/rbutilqt/base/playerbuildinfo.cpp
@@ -111,11 +111,6 @@ void PlayerBuildInfo::setBuildInfo(QString file)
     serverInfo = new QSettings(file, QSettings::IniFormat);
 }
 
-QVariant PlayerBuildInfo::value(BuildInfo item)
-{
-        return value(item, TypeRelease);
-}
-
 QVariant PlayerBuildInfo::value(BuildInfo item, BuildType type)
 {
     // locate setting item in server info file
@@ -332,7 +327,7 @@ QVariant PlayerBuildInfo::value(DeviceInfo item, unsigned int match)
 
 QVariant PlayerBuildInfo::value(SystemUrl item)
 {
-    // locate setting item in server info file
+    // locate setting item in the rbutil.ini file
     int i = 0;
     while(PlayerSystemUrls[i].item != item)
         i++;
@@ -342,6 +337,17 @@ QVariant PlayerBuildInfo::value(SystemUrl item)
     return result;
 }
 
+QVariant PlayerBuildInfo::value(BuildInfo item)
+{
+    // locate setting item in the serverInfo file
+    int i = 0;
+    while(ServerInfoList[i].item != item)
+        i++;
+
+    QVariant result = serverInfo->value(ServerInfoList[i].name);
+    LOG_INFO() << "U:" << ServerInfoList[i].name << result;
+    return result;
+}
 
 QString PlayerBuildInfo::statusAsString(QString platform)
 {
diff --git a/utils/rbutilqt/base/playerbuildinfo.h b/utils/rbutilqt/base/playerbuildinfo.h
index 03f22d6ec6..3e76853758 100644
--- a/utils/rbutilqt/base/playerbuildinfo.h
+++ b/utils/rbutilqt/base/playerbuildinfo.h
@@ -106,11 +106,13 @@ public:
 
     // Get build information for currently selected player.
     QVariant value(BuildInfo item, BuildType type);
-    QVariant value(BuildInfo item);
 
-    // Get fixed download URL information
+    // Get fixed download URL information from rbutil.ini
     QVariant value(SystemUrl item);
 
+    // Get fixed download URL information from serverInfo
+    QVariant value(BuildInfo item);
+
     QString statusAsString(QString target = "");
 
 protected:
-- 
rockbox-cvs mailing list
[email protected]
https://lists.haxx.se/mailman/listinfo/rockbox-cvs