diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-06-02 00:07:30 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-06-02 00:07:30 +0200 |
commit | 96e7cc9e80cc33d893b60308cd091e29b2e553d8 (patch) | |
tree | cd6a88536fb15a9e6876bd335e5436dfe09b4f7e | |
parent | 87bb7471bb07f8a41749cb0d6d1dae05163821c9 (diff) | |
download | rockbox-96e7cc9e80cc33d893b60308cd091e29b2e553d8.tar.gz rockbox-96e7cc9e80cc33d893b60308cd091e29b2e553d8.zip |
Only support pregenerated voice file for releases.
The voice file installed needs to match the Rockbox version installed. If not
the voice might not match the actual entries.
Rockbox Utility always was sloppy on this and installed the latest archived
(previously "daily") builds voice file for the latest development (previously
"current") build. Archived builds aren't supported anymore in Rockbox Utility,
so remove support for installing archived voice files as well.
There are no pregenerated voice files for development versions provided, and
Rockbox Utility can generate voice files anyway. Also, those files are only
provided and most users seem to prefer to use the voices they have installed on
their PC.
Change-Id: I17817da8a14dc5f8b0ef208579d8d75fa86ab610
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 15620209e9..7077673701 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -913,8 +913,12 @@ void RbUtilQt::installVoice() | |||
913 | } | 913 | } |
914 | if(relversion.isEmpty()) { | 914 | if(relversion.isEmpty()) { |
915 | // release is empty for non-release versions (i.e. daily / current) | 915 | // release is empty for non-release versions (i.e. daily / current) |
916 | voiceurl = SystemInfo::value(SystemInfo::DailyVoiceUrl).toString(); | 916 | QMessageBox::critical(this, tr("No voice available"), |
917 | logversion = installInfo.revision(); | 917 | tr("The installed version of Rockbox is a development version. " |
918 | "Pre-built voices are only available for release versions " | ||
919 | "of Rockbox. Please generate a voice yourself using the " | ||
920 | "\"Create voice file\" functionality.")); | ||
921 | return; | ||
918 | } | 922 | } |
919 | else { | 923 | else { |
920 | voiceurl = SystemInfo::value(SystemInfo::ReleaseVoiceUrl).toString(); | 924 | voiceurl = SystemInfo::value(SystemInfo::ReleaseVoiceUrl).toString(); |
@@ -925,11 +929,8 @@ void RbUtilQt::installVoice() | |||
925 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) | 929 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) |
926 | return; | 930 | return; |
927 | 931 | ||
928 | QDate date = QDate::fromString( | ||
929 | ServerInfo::value(ServerInfo::DailyDate).toString(), Qt::ISODate); | ||
930 | QString model = SystemInfo::value(SystemInfo::CurBuildserverModel).toString(); | 932 | QString model = SystemInfo::value(SystemInfo::CurBuildserverModel).toString(); |
931 | // replace placeholder in voice url | 933 | // replace placeholder in voice url |
932 | voiceurl.replace("%DATE%", date.toString("yyyyMMdd")); | ||
933 | voiceurl.replace("%MODEL%", model); | 934 | voiceurl.replace("%MODEL%", model); |
934 | voiceurl.replace("%RELVERSION%", relversion); | 935 | voiceurl.replace("%RELVERSION%", relversion); |
935 | 936 | ||