Ticket #81: variantSelection.patch

source/gui/settingsDialogs.py

@@ -309 +309 @@
 
         def onVariantChange(self,evt):
                 val=evt.GetSelection()
-                getSynth().variant=getSynth().getVariantIdentifier(val)
+                s=getSynth()
+                speech.cancelSpeech()
+                s.variant=s.getVariantIdentifier(val)
 
         def onRateChange(self,evt):
                 val=evt.GetSelection()

source/synthDrivers/_espeak.py

@@ -215 +215 @@
         espeakDLL.espeak_SetVoiceByName(voice.identifier)
 
 def setVoiceByName(name):
-        espeakDLL.espeak_SetVoiceByName(name)
+        _bgExec(espeakDLL.espeak_SetVoiceByName,name)
 
 def setVoiceByLanguage(lang):
         v=espeak_VOICE()

source/synthDrivers/espeak.py

@@ -123 +123 @@
                         self._variant="none"
                 identifier=_espeak.getCurrentVoice().identifier.split('+')[0]
                 if self._variant =="none":
-                        _espeak.setVoiceByName(identifier.split('+')[0])
-                else:
-                        identifier="%s+%s"%(identifier,self._variant)
-                try:
                         _espeak.setVoiceByName(identifier)
-                except:
-                        _espeak.setVoiceByName(identifier.split('+')[0])
+                else:
+                        try:
+                                _espeak.setVoiceByName("%s+%s"%(identifier,val))
+                        except:
+                                _espeak.setVoiceByName(identifier)
 
         def _get_variantCount(self):
                 return len(self._variantDict)