diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-04-22 18:58:01 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-04-22 18:58:01 +0000 |
commit | 3467ee8dddbeb6be616aac6928190f92978473e6 (patch) | |
tree | f56b731cee90268e311bf03fca95012b94a8dd87 /rbutil/rbutilqt/base/ttssapi.cpp | |
parent | c6a8efb8afb848e0001eacdb8376f1aa46a33733 (diff) | |
download | rockbox-3467ee8dddbeb6be616aac6928190f92978473e6.tar.gz rockbox-3467ee8dddbeb6be616aac6928190f92978473e6.zip |
Fix SAPI default speed being way too fast.
The settings currently can't differentiate between default values for different
subitems (i.e. different TTS systems). As a result the default value returned
for SAPI speed was way out of bounds, leading to the upper limit getting used.
Work around this limitation by checking the value for bounds and use a sensible
value in that case.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29763 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/base/ttssapi.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/ttssapi.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/base/ttssapi.cpp b/rbutil/rbutilqt/base/ttssapi.cpp index 2cc95cd4aa..cd9ced8083 100644 --- a/rbutil/rbutilqt/base/ttssapi.cpp +++ b/rbutil/rbutilqt/base/ttssapi.cpp | |||
@@ -52,8 +52,11 @@ void TTSSapi::generateSettings() | |||
52 | connect(setting,SIGNAL(refresh()),this,SLOT(updateVoiceList())); | 52 | connect(setting,SIGNAL(refresh()),this,SLOT(updateVoiceList())); |
53 | insertSetting(eVOICE,setting); | 53 | insertSetting(eVOICE,setting); |
54 | //speed | 54 | //speed |
55 | insertSetting(eSPEED,new EncTtsSetting(this,EncTtsSetting::eINT, | 55 | int speed = RbSettings::subValue("sapi", RbSettings::TtsSpeed).toInt(); |
56 | tr("Speed:"),RbSettings::subValue("sapi",RbSettings::TtsSpeed),-10,10)); | 56 | if(speed > 10 || speed < -10) |
57 | speed = 0; | ||
58 | insertSetting(eSPEED, new EncTtsSetting(this, EncTtsSetting::eINT, | ||
59 | tr("Speed:"), speed, -10, 10)); | ||
57 | // options | 60 | // options |
58 | insertSetting(eOPTIONS,new EncTtsSetting(this,EncTtsSetting::eSTRING, | 61 | insertSetting(eOPTIONS,new EncTtsSetting(this,EncTtsSetting::eSTRING, |
59 | tr("Options:"),RbSettings::subValue("sapi",RbSettings::TtsOptions))); | 62 | tr("Options:"),RbSettings::subValue("sapi",RbSettings::TtsOptions))); |