summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/base/ttscarbon.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2011-04-03 09:23:21 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2011-04-03 09:23:21 +0000
commit1c635a8c3c49c1c657b5c387d53086da5d6c08d3 (patch)
tree03252d5277fa2ba9c0a1cfa5dfb425e72196a4f6 /rbutil/rbutilqt/base/ttscarbon.cpp
parent746f01dd775feb9b53577a2338fd9182d879c0d3 (diff)
downloadrockbox-1c635a8c3c49c1c657b5c387d53086da5d6c08d3.tar.gz
rockbox-1c635a8c3c49c1c657b5c387d53086da5d6c08d3.zip
OS X TTS: add pitch setting.
The current TTS configuration doesn't allow querying the system values so it currently can't be displayed. A value of 0 will use the system default. The default pitch is dependent on the voice; most voices should have a default pitch of 45 - 55. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29673 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/base/ttscarbon.cpp')
-rw-r--r--rbutil/rbutilqt/base/ttscarbon.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/rbutil/rbutilqt/base/ttscarbon.cpp b/rbutil/rbutilqt/base/ttscarbon.cpp
index ba744b5fcf..96a9bf6852 100644
--- a/rbutil/rbutilqt/base/ttscarbon.cpp
+++ b/rbutil/rbutilqt/base/ttscarbon.cpp
@@ -89,6 +89,12 @@ bool TTSCarbon::start(QString *errStr)
89 RbSettings::TtsSpeed).toInt()); 89 RbSettings::TtsSpeed).toInt());
90 if(rate != 0) 90 if(rate != 0)
91 SetSpeechRate(m_channel, rate); 91 SetSpeechRate(m_channel, rate);
92
93 Fixed pitch = (Fixed)(0x10000 * RbSettings::subValue("carbon",
94 RbSettings::TtsPitch).toInt());
95 if(pitch != 0)
96 SetSpeechPitch(m_channel, pitch);
97
92 return (error == 0) ? true : false; 98 return (error == 0) ? true : false;
93} 99}
94 100
@@ -139,6 +145,14 @@ void TTSCarbon::generateSettings(void)
139 tr("Speed (words/min):"), speed, 80, 500, 145 tr("Speed (words/min):"), speed, 80, 500,
140 EncTtsSetting::eNOBTN); 146 EncTtsSetting::eNOBTN);
141 insertSetting(ConfigSpeed, setting); 147 insertSetting(ConfigSpeed, setting);
148
149 // pitch
150 int pitch = RbSettings::subValue("carbon", RbSettings::TtsPitch).toInt();
151 setting = new EncTtsSetting(this, EncTtsSetting::eINT,
152 tr("Pitch (0 for default):"), pitch, 0, 65,
153 EncTtsSetting::eNOBTN);
154 insertSetting(ConfigPitch, setting);
155
142} 156}
143 157
144 158
@@ -149,6 +163,8 @@ void TTSCarbon::saveSettings(void)
149 getSetting(ConfigVoice)->current().toString()); 163 getSetting(ConfigVoice)->current().toString());
150 RbSettings::setSubValue("carbon", RbSettings::TtsSpeed, 164 RbSettings::setSubValue("carbon", RbSettings::TtsSpeed,
151 getSetting(ConfigSpeed)->current().toInt()); 165 getSetting(ConfigSpeed)->current().toInt());
166 RbSettings::setSubValue("carbon", RbSettings::TtsPitch,
167 getSetting(ConfigPitch)->current().toInt());
152 RbSettings::sync(); 168 RbSettings::sync();
153} 169}
154 170