From 0e315e848ae7ea5b226af4ab16c215119cbd3fb3 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 5 Dec 2020 13:14:43 +0100 Subject: rbutil: Rework handling of available voice languages. - Move Rockbox voice language names handling to PlayerBuildInfo, and handle it similarly to the rest of the device specific values. Rework internal handling to simplify things. - Enable language list from build server for installing prerendered voice files other than english. - Extend unit tests. Change-Id: I1a1a717fa4409fa965dabc86f52d52a4fc516315 --- rbutil/rbutilqt/test/test-playerbuildinfo.cpp | 37 +++++++++++++++------------ 1 file changed, 20 insertions(+), 17 deletions(-) (limited to 'rbutil/rbutilqt/test') diff --git a/rbutil/rbutilqt/test/test-playerbuildinfo.cpp b/rbutil/rbutilqt/test/test-playerbuildinfo.cpp index fe07ba8348..a250e37979 100644 --- a/rbutil/rbutilqt/test/test-playerbuildinfo.cpp +++ b/rbutil/rbutilqt/test/test-playerbuildinfo.cpp @@ -137,23 +137,26 @@ struct { QString expected; } testdataPlayer[] = { - {"archosfmrecorder", PlayerBuildInfo::BuildStatus, "3"}, - { "iriverh10", PlayerBuildInfo::BuildStatus, "0" }, - { "iriverh100", PlayerBuildInfo::BuildStatus, "2" }, - { "iriverh300", PlayerBuildInfo::BuildStatus, "1" }, - { "archosfmrecorder", PlayerBuildInfo::BuildStatus, "3" }, - {"archosfmrecorder", PlayerBuildInfo::DisplayName, "Jukebox Recorder FM"}, - {"archosfmrecorder", PlayerBuildInfo::BootloaderMethod, "none"}, - {"archosfmrecorder", PlayerBuildInfo::BootloaderName, ""}, - {"archosfmrecorder", PlayerBuildInfo::BootloaderFile, ""}, - {"archosfmrecorder", PlayerBuildInfo::BootloaderFilter, ""}, - {"archosfmrecorder", PlayerBuildInfo::Encoder, "lame"}, - {"archosfmrecorder", PlayerBuildInfo::Brand, "Archos"}, - {"archosfmrecorder", PlayerBuildInfo::PlayerPicture, "archosfmrecorder"}, - {"iriverh100", PlayerBuildInfo::BuildStatus, "2"}, - {"iriverh100", PlayerBuildInfo::BootloaderMethod, "hex"}, - {"iriverh100", PlayerBuildInfo::BootloaderFilter, "*.hex *.zip"}, - {"ipodmini2g", PlayerBuildInfo::Encoder, "rbspeex"}, + { "archosfmrecorder", PlayerBuildInfo::BuildStatus, "3" }, + { "iriverh10", PlayerBuildInfo::BuildStatus, "0" }, + { "iriverh100", PlayerBuildInfo::BuildStatus, "2" }, + { "iriverh300", PlayerBuildInfo::BuildStatus, "1" }, + { "archosfmrecorder", PlayerBuildInfo::BuildStatus, "3" }, + { "archosfmrecorder", PlayerBuildInfo::DisplayName, "Jukebox Recorder FM"}, + { "archosfmrecorder", PlayerBuildInfo::BootloaderMethod, "none" }, + { "archosfmrecorder", PlayerBuildInfo::BootloaderName, "" }, + { "archosfmrecorder", PlayerBuildInfo::BootloaderFile, "" }, + { "archosfmrecorder", PlayerBuildInfo::BootloaderFilter, "" }, + { "archosfmrecorder", PlayerBuildInfo::Encoder, "lame" }, + { "archosfmrecorder", PlayerBuildInfo::Brand, "Archos" }, + { "archosfmrecorder", PlayerBuildInfo::PlayerPicture, "archosfmrecorder"}, + { "iriverh100", PlayerBuildInfo::BuildStatus, "2" }, + { "iriverh100", PlayerBuildInfo::BootloaderMethod, "hex" }, + { "iriverh100", PlayerBuildInfo::BootloaderFilter, "*.hex *.zip" }, + { "ipodmini2g", PlayerBuildInfo::Encoder, "rbspeex" }, + { "078174b1", PlayerBuildInfo::DisplayName, "Sansa View" }, + { "de", PlayerBuildInfo::LanguageInfo, "deutsch,Deutsch" }, + { "en_US", PlayerBuildInfo::LanguageInfo, "english-us,English (US)" }, }; void TestPlayerBuildInfo::testBuildInfo_data() -- cgit v1.2.3