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

1 files changed, 0 insertions, 26 deletions

diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 321d4bd096..9a99909f92 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -20,32 +20,6 @@ rbutil_url=http://download.rockbox.org/rbutil/
 info_url=http://download.rockbox.org/bootloader/bootloaders-info
 download_url=http://download.rockbox.org/bootloader
 
-[release]
-build_url=https://download.rockbox.org/release/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip
-voice_url=https://download.rockbox.org/release/%RELVERSION%/%MODEL%-%RELVERSION%-%LANGUAGE%.zip
-font_url=https://download.rockbox.org/release/%RELVERSION%/rockbox-fonts-%RELVERSION%.zip
-manual_url=https://download.rockbox.org/release/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%%FORMAT%
-
-[release-candidate]
-build_url=https://download.rockbox.org/release-candidate/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip
-voice_url=https://download.rockbox.org/release-candidate/%RELVERSION%/%MODEL%-%RELVERSION%-%LANGUAGE%.zip
-font_url=https://download.rockbox.org/release-candidate/%RELVERSION%/rockbox-fonts-%RELVERSION%.zip
-manual_url=https://download.rockbox.org/release-candidate/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%%FORMAT%
-
-[development]
-build_url=http://build.rockbox.org/data/rockbox-%MODEL%.zip
-; we don't have voices for dev builds.
-voice_url=https://download.rockbox.org/daily/voices/%MODEL%-%LANGUAGE%.zip
-font_url=https://download.rockbox.org/daily/fonts/rockbox-fonts.zip
-; manual is only built daily, use that one instead.
-manual_url=https://download.rockbox.org/daily/manual/rockbox-%MODEL%%FORMAT%
-
-[daily]
-build_url=https://download.rockbox.org/daily/%MODEL%/rockbox-%MODEL%.zip
-voice_url=https://download.rockbox.org/daily/%MODEL%/voice-%MODEL%-%LANGUAGE%.zip
-font_url=https://download.rockbox.org/daily/fonts/rockbox-fonts.zip
-manual_url=https://download.rockbox.org/daily/manual/rockbox-%MODEL%%FORMAT%
-
 ; [platforms] is used to determine the order in the device tree.
 ; Only devices present in this section will get displayed!
 [platforms]