Changeset 2482

Timestamp:

11/09/08 11:49:07 (2 months ago)

Author:

bzr

Message:

Merge ticket19 branch:

• change: Voices are now stored in the configuration file by ID instead of by index. This makes voice settings more reliable across systems and configuration changes. The voice setting will not be preserved in old configurations and an error may be logged the first time a synthesizer is used. (#19)
• fix: The eSpeak synthesizer driver no longer stops speaking completely after a single error.
• fix: Fix the issue whereby updated voice parameters (rate, pitch, etc.) were not saved when the voice was changed from the synthesizer settings ring.
• Some minor fixes to the sapi4 driver.

Location:

trunk

Files:

• . (modified) (5 props)
• source/config/__init__.py (modified) (1 diff)
• source/gui/settingsDialogs.py (modified) (3 diffs)
• source/synthDriverHandler.py (modified) (9 diffs)
• source/synthDrivers/_espeak.py (modified) (1 diff)
• source/synthDrivers/audiologic.py (modified) (1 diff)
• source/synthDrivers/espeak.py (modified) (4 diffs)
• source/synthDrivers/sapi4.py (modified) (2 diffs)
• source/synthDrivers/sapi5.py (modified) (3 diffs)
• source/synthSettingsRing.py (modified) (1 diff)
• user_docs/whats new.txt (modified) (1 diff)

trunk

@@ -1 @@
-timestamp: 2008-11-06 17:51:53.163000107 +1000
+timestamp: 2008-11-09 22:45:27.869999886 +1100
 committer: James Teh <jamie@jantrid.net>
 properties: 
 jamie@jantrid.net-20081022055144-zd6v96gjzz94ript
 jamie@jantrid.net-20081104100702-aqivw5dfzmygyo17
+jamie@jantrid.net-20081109113343-zabfejnnivsxf2gd
 2279 jamie@jantrid.net-20081106071205-mve6ffhfpwjrngz8
 2280 jamie@jantrid.net-20081106075153-p4o534murjkdzapb
+2281 jamie@jantrid.net-20081109114527-f0kqf0o8k8713bsc
-source/generate.py      343@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Fgenerate.py
+source/config/__init__.py       46@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Fconfig%2F__init__.py
+source/gui/settingsDialogs.py   299@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Fgui%2FsettingsDialogs.py
+source/synthDriverHandler.py    97@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FsynthDriverHandler.py
+source/synthDrivers/_espeak.py  612@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FsynthDrivers%2F_espeak.py
+source/synthDrivers/audiologic.py       audiologic.py-20080701031200-sjkq3p9snm96sxhq-2
+source/synthDrivers/espeak.py   612@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FsynthDrivers%2Fespeak.py
+source/synthDrivers/sapi4.py    sapi4.py-20081105062308-fz5mgli5iso5vcdq-2
+source/synthDrivers/sapi5.py    94@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FsynthDrivers%2Fsapi5.py
+source/synthSettingsRing.py     1111@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2F_synthSettingsRing.py
+user_docs/whats%20new.txt       559@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:user_docs%2Fwhats%20new.txt
+source/config/__init__.py       mick@kulgan.net-20081106053934-wy7im3e0a4n01gd5
+source/gui/settingsDialogs.py   jamie@jantrid.net-20081109091405-cr7i6qx0r32qxzv2
+source/synthDriverHandler.py    jamie@jantrid.net-20081109113343-zabfejnnivsxf2gd
+source/synthDrivers/_espeak.py  jamie@jantrid.net-20081106064553-6iftm4vexioo630i
+source/synthDrivers/audiologic.py       jamie@jantrid.net-20081109052259-kxgyslupb8qa1jye
+source/synthDrivers/espeak.py   jamie@jantrid.net-20081109052655-7z096nch59fgwzl5
+source/synthDrivers/sapi4.py    mick@kulgan.net-20081109055011-8tcy3vfb69sjdwge
+source/synthDrivers/sapi5.py    jamie@jantrid.net-20081109052259-kxgyslupb8qa1jye
+source/synthSettingsRing.py     jamie@jantrid.net-20081109100954-vzi0052zk64nib6y
+user_docs/whats%20new.txt       jamie@jantrid.net-20081109105054-ollwznuzdm6qy6ho

@@ -1 @@
-timestamp: 2008-11-06 17:51:53.163000107 +1000
+timestamp: 2008-11-09 22:45:27.869999886 +1100
 committer: James Teh <jamie@jantrid.net>
 properties: 

@@ -12 +12 @@
 jamie@jantrid.net-20081022055144-zd6v96gjzz94ript
 jamie@jantrid.net-20081104100702-aqivw5dfzmygyo17
+jamie@jantrid.net-20081109113343-zabfejnnivsxf2gd

@@ -251 +251 @@
 2279 jamie@jantrid.net-20081106071205-mve6ffhfpwjrngz8
 2280 jamie@jantrid.net-20081106075153-p4o534murjkdzapb
+2281 jamie@jantrid.net-20081109114527-f0kqf0o8k8713bsc

@@ -1 @@
-source/generate.py      343@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Fgenerate.py
+source/config/__init__.py       46@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Fconfig%2F__init__.py
+source/gui/settingsDialogs.py   299@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Fgui%2FsettingsDialogs.py
+source/synthDriverHandler.py    97@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FsynthDriverHandler.py
+source/synthDrivers/_espeak.py  612@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FsynthDrivers%2F_espeak.py
+source/synthDrivers/audiologic.py       audiologic.py-20080701031200-sjkq3p9snm96sxhq-2
+source/synthDrivers/espeak.py   612@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FsynthDrivers%2Fespeak.py
+source/synthDrivers/sapi4.py    sapi4.py-20081105062308-fz5mgli5iso5vcdq-2
+source/synthDrivers/sapi5.py    94@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FsynthDrivers%2Fsapi5.py
+source/synthSettingsRing.py     1111@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2F_synthSettingsRing.py
+user_docs/whats%20new.txt       559@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:user_docs%2Fwhats%20new.txt

@@ +1 @@
+source/config/__init__.py       mick@kulgan.net-20081106053934-wy7im3e0a4n01gd5
+source/gui/settingsDialogs.py   jamie@jantrid.net-20081109091405-cr7i6qx0r32qxzv2
+source/synthDriverHandler.py    jamie@jantrid.net-20081109113343-zabfejnnivsxf2gd
+source/synthDrivers/_espeak.py  jamie@jantrid.net-20081106064553-6iftm4vexioo630i
+source/synthDrivers/audiologic.py       jamie@jantrid.net-20081109052259-kxgyslupb8qa1jye
+source/synthDrivers/espeak.py   jamie@jantrid.net-20081109052655-7z096nch59fgwzl5
+source/synthDrivers/sapi4.py    mick@kulgan.net-20081109055011-8tcy3vfb69sjdwge
+source/synthDrivers/sapi5.py    jamie@jantrid.net-20081109052259-kxgyslupb8qa1jye
+source/synthSettingsRing.py     jamie@jantrid.net-20081109100954-vzi0052zk64nib6y
+user_docs/whats%20new.txt       jamie@jantrid.net-20081109105054-ollwznuzdm6qy6ho

trunk/source/config/__init__.py

@@ -43 +43 @@
                 capPitchChange = integer(default=30,min=-100,max=100)
                 volume = integer(default=100,min=0,max=100)
-                voice = integer(default=1,min=1)
+                voice = string()
                 raisePitchForCapitals = boolean(default=true)
                 sayCapForCapitals = boolean(default=false)

trunk/source/gui/settingsDialogs.py

@@ -208 +208 @@
         def makeSettings(self, settingsSizer):
                 if getSynth().hasVoice:
-                        voiceListSizer=wx.BoxSizer(wx.HORIZONTAL)
-                        voiceListLabel=wx.StaticText(self,-1,label=_("&Voice"))
-                        voiceListID=wx.NewId()
-                        self.voiceList=wx.Choice(self,voiceListID,name="Voice:",choices=[getSynth().getVoiceName(x) for x in range(1,getSynth().voiceCount+1)])
+                        sizer=wx.BoxSizer(wx.HORIZONTAL)
+                        label=wx.StaticText(self,wx.ID_ANY,label=_("&Voice"))
+                        self._voices=getSynth().availableVoices
+                        self.voiceList=wx.Choice(self,wx.ID_ANY,name="Voice:",choices=[x.name for x in self._voices])
                         try:
-                                voiceIndex=getSynth().voice
-                                voiceIndex-=1
-                                if voiceIndex>=0 and voiceIndex<getSynth().voiceCount:
-                                        self.voiceList.SetSelection(voiceIndex)
-                        except:
+                                curVoice=getSynth().voice
+                                voiceIndex=[x.ID for x in self._voices].index(curVoice)
+                                self.voiceList.SetSelection(voiceIndex)
+                        except ValueError:
                                 pass
                         self.voiceList.Bind(wx.EVT_CHOICE,self.onVoiceChange)
-                        voiceListSizer.Add(voiceListLabel)
-                        voiceListSizer.Add(self.voiceList)
-                        settingsSizer.Add(voiceListSizer,border=10,flag=wx.BOTTOM)
+                        sizer.Add(label)
+                        sizer.Add(self.voiceList)
+                        settingsSizer.Add(sizer,border=10,flag=wx.BOTTOM)
                 if getSynth().hasVariant:
-                        variantListSizer=wx.BoxSizer(wx.HORIZONTAL)
-                        variantListLabel=wx.StaticText(self,-1,label=_("V&ariant"))
-                        variantListID=wx.NewId()
-                        self.variantList=wx.Choice(self,variantListID,name="Variant:",choices=[getSynth().getVariantName(x) for x in range(0,getSynth().variantCount)])
-                        currentVariant=getSynth().variant
-                        for x in range(0,getSynth().variantCount):
-                                if currentVariant==getSynth().getVariantIdentifier(x):
-                                        break
-                        self.variantList.SetSelection(x)
+                        sizer=wx.BoxSizer(wx.HORIZONTAL)
+                        label=wx.StaticText(self,wx.ID_ANY,label=_("V&ariant"))
+                        self._variants=getSynth().availableVariants
+                        self.variantList=wx.Choice(self,wx.ID_ANY,name="Variant:",choices=[x.name for x in self._variants])
+                        try:
+                                curVariant=getSynth().variant
+                                variantIndex=[x.ID for x in self._variants].index(curVariant)
+                                self.variantList.SetSelection(variantIndex)
+                        except ValueError:
+                                pass
                         self.variantList.Bind(wx.EVT_CHOICE,self.onVariantChange)
-                        variantListSizer.Add(variantListLabel)
-                        variantListSizer.Add(self.variantList)
-                        settingsSizer.Add(variantListSizer,border=10,flag=wx.BOTTOM)
-                if getSynth().hasRate:
-                        rateSliderSizer=wx.BoxSizer(wx.HORIZONTAL)
-                        rateSliderLabel=wx.StaticText(self,-1,label=_("&Rate"))
-                        rateSliderID=wx.NewId()
-                        self.rateSlider=wx.Slider(self,rateSliderID,value=getSynth().rate,minValue=0,maxValue=100,name="Rate:")
-                        self._setSliderStepSizes(self.rateSlider,getSynth().rateMinStep)
-                        self.rateSlider.Bind(wx.EVT_SLIDER,self.onRateChange)
-                        rateSliderSizer.Add(rateSliderLabel)
-                        rateSliderSizer.Add(self.rateSlider)
-                        settingsSizer.Add(rateSliderSizer,border=10,flag=wx.BOTTOM)
-                if getSynth().hasPitch:
-                        pitchSliderSizer=wx.BoxSizer(wx.HORIZONTAL)
-                        pitchSliderLabel=wx.StaticText(self,-1,label=_("&Pitch"))
-                        pitchSliderID=wx.NewId()
-                        self.pitchSlider=wx.Slider(self,pitchSliderID,value=getSynth().pitch,minValue=0,maxValue=100)
-                        self._setSliderStepSizes(self.pitchSlider,getSynth().pitchMinStep)
-                        self.pitchSlider.Bind(wx.EVT_SLIDER,self.onPitchChange)
-                        pitchSliderSizer.Add(pitchSliderLabel)
-                        pitchSliderSizer.Add(self.pitchSlider)
-                        settingsSizer.Add(pitchSliderSizer,border=10,flag=wx.BOTTOM)
-                if getSynth().hasInflection:
-                        inflectionSliderSizer=wx.BoxSizer(wx.HORIZONTAL)
-                        inflectionSliderLabel=wx.StaticText(self,-1,label=_("&Inflection"))
-                        inflectionSliderID=wx.NewId()
-                        self.inflectionSlider=wx.Slider(self,inflectionSliderID,value=getSynth().inflection,minValue=0,maxValue=100)
-                        self._setSliderStepSizes(self.inflectionSlider,getSynth().inflectionMinStep)
-                        self.inflectionSlider.Bind(wx.EVT_SLIDER,self.onInflectionChange)
-                        inflectionSliderSizer.Add(inflectionSliderLabel)
-                        inflectionSliderSizer.Add(self.inflectionSlider)
-                        settingsSizer.Add(inflectionSliderSizer,border=10,flag=wx.BOTTOM)
-                if getSynth().hasVolume:
-                        volumeSliderSizer=wx.BoxSizer(wx.HORIZONTAL)
-                        volumeSliderLabel=wx.StaticText(self,-1,label=_("V&olume"))
-                        volumeSliderID=wx.NewId()
-                        self.volumeSlider=wx.Slider(self,volumeSliderID,value=getSynth().volume,minValue=0,maxValue=100)
-                        self._setSliderStepSizes(self.volumeSlider,getSynth().volumeMinStep)
-                        self.volumeSlider.Bind(wx.EVT_SLIDER,self.onVolumeChange)
-                        volumeSliderSizer.Add(volumeSliderLabel)
-                        volumeSliderSizer.Add(self.volumeSlider)
-                        settingsSizer.Add(volumeSliderSizer,border=10,flag=wx.BOTTOM)
+                        sizer.Add(label)
+                        sizer.Add(self.variantList)
+                        settingsSizer.Add(sizer,border=10,flag=wx.BOTTOM)
+                sizer=wx.BoxSizer(wx.HORIZONTAL)
+                label=wx.StaticText(self,wx.ID_ANY,label=_("&Rate"))
+                self.rateSlider=wx.Slider(self,wx.ID_ANY,minValue=0,maxValue=100,name="Rate:")
+                self.rateSlider.Bind(wx.EVT_SLIDER,self.onRateChange)
+                self._setSliderStepSizes(self.rateSlider,getSynth().rateMinStep)
+                sizer.Add(label)
+                sizer.Add(self.rateSlider)
+                settingsSizer.Add(sizer,border=10,flag=wx.BOTTOM)
+                sizer=wx.BoxSizer(wx.HORIZONTAL)
+                label=wx.StaticText(self,wx.ID_ANY,label=_("&Pitch"))
+                self.pitchSlider=wx.Slider(self,wx.ID_ANY,minValue=0,maxValue=100)
+                self._setSliderStepSizes(self.pitchSlider,getSynth().pitchMinStep)
+                self.pitchSlider.Bind(wx.EVT_SLIDER,self.onPitchChange)
+                sizer.Add(label)
+                sizer.Add(self.pitchSlider)
+                settingsSizer.Add(sizer,border=10,flag=wx.BOTTOM)
+                sizer=wx.BoxSizer(wx.HORIZONTAL)
+                label=wx.StaticText(self,wx.ID_ANY,label=_("&Inflection"))
+                self.inflectionSlider=wx.Slider(self,wx.ID_ANY,minValue=0,maxValue=100)
+                self._setSliderStepSizes(self.inflectionSlider,getSynth().inflectionMinStep)
+                self.inflectionSlider.Bind(wx.EVT_SLIDER,self.onInflectionChange)
+                sizer.Add(label)
+                sizer.Add(self.inflectionSlider)
+                settingsSizer.Add(sizer,border=10,flag=wx.BOTTOM)
+                sizer=wx.BoxSizer(wx.HORIZONTAL)
+                label=wx.StaticText(self,wx.ID_ANY,label=_("V&olume"))
+                self.volumeSlider=wx.Slider(self,wx.ID_ANY,minValue=0,maxValue=100)
+                self._setSliderStepSizes(self.volumeSlider,getSynth().volumeMinStep)
+                self.volumeSlider.Bind(wx.EVT_SLIDER,self.onVolumeChange)
+                sizer.Add(label)
+                sizer.Add(self.volumeSlider)
+                settingsSizer.Add(sizer,border=10,flag=wx.BOTTOM)
+                self._setVoiceParameters()
                 self.punctuationCheckBox=wx.CheckBox(self,wx.NewId(),label=_("&Speak all punctuation"))
                 self.punctuationCheckBox.SetValue(config.conf["speech"]["speakPunctuation"])
@@ -293 +286 @@
                 self.voiceList.SetFocus()
 
+        def _setVoiceParameters(self):
+                if getSynth().hasRate:
+                        self.rateSlider.Enable()
+                        self.rateSlider.SetValue(getSynth().rate)
+                else:
+                        self.rateSlider.Disable()
+                if getSynth().hasPitch:
+                        self.pitchSlider.Enable()
+                        self.pitchSlider.SetValue(getSynth().pitch)
+                else:
+                        self.pitchSlider.Disable()
+                if getSynth().hasInflection:
+                        self.inflectionSlider.Enable()
+                        self.inflectionSlider.SetValue(getSynth().inflection)
+                else:
+                        self.inflectionSlider.Disable()
+                if getSynth().hasVolume:
+                        self.volumeSlider.Enable()
+                        self.volumeSlider.SetValue(getSynth().volume)
+                else:
+                        self.volumeSlider.Disable()
+
         def onVoiceChange(self,evt):
-                changeVoice(getSynth(),evt.GetSelection()+1)
-                rate=getSynth().rate
-                self.rateSlider.SetValue(rate)
-                pitch=getSynth().pitch
-                self.pitchSlider.SetValue(pitch)
-                volume=getSynth().volume
-                self.volumeSlider.SetValue(volume)
+                changeVoice(getSynth(),self._voices[evt.GetSelection()].ID)
+                self._setVoiceParameters()
 
         def onVariantChange(self,evt):
-                val=evt.GetSelection()
-                s=getSynth()
-                s.variant=s.getVariantIdentifier(val)
+                getSynth().variant=self._variants[evt.GetSelection()].ID
 
         def onRateChange(self,evt):
@@ -340 +348 @@
         def onOk(self,evt):
                 if getSynth().hasVoice:
-                        config.conf["speech"][getSynth().name]["voice"]=self.voiceList.GetSelection()+1
+                        config.conf["speech"][getSynth().name]["voice"]=self._voices[self.voiceList.GetSelection()].ID
                 if getSynth().hasVariant:
-                        config.conf["speech"][getSynth().name]["variant"]=getSynth().getVariantIdentifier(self.variantList.GetSelection())
+                        config.conf["speech"][getSynth().name]["variant"]=self._variants[self.variantList.GetSelection()].ID
                 if getSynth().hasRate:
                         config.conf["speech"][getSynth().name]["rate"]=self.rateSlider.GetValue()

trunk/source/synthDriverHandler.py

@@ -19 +19 @@
 
 def changeVoice(synth, voice):
-        voiceName=synth.getVoiceName(voice).replace('\\','_')
+        voiceName=synth.getVoiceInfoByID(voice).name
+        voiceName=voiceName.replace('\\','_')
         fileName="%s/%s-%s.dic"%(speechDictHandler.speechDictsPath,synth.name,voiceName)
         speechDictHandler.dictionaries["voice"].load(fileName)
@@ -56 +57 @@
                 if not updatedConfig:
                         if newSynth.hasVoice:
-                                changeVoice(newSynth,config.conf["speech"][name]["voice"])
+                                voice=config.conf["speech"][name]["voice"]
+                                try:
+                                        changeVoice(newSynth,voice)
+                                except LookupError:
+                                        log.warning("No such voice: %s" % voice)
                         if newSynth.hasVariant:
                                 newSynth.variant=config.conf["speech"][name]["variant"]
@@ -111 +116 @@
         for example, L{_get_pitch} and L{_set_pitch} for L{pitch}.
         The methods L{speakText}, L{cancel} and L{pause} should be overridden as appropriate.
-        @ivar voice: The current voice.
-        @type voice: int
-        @ivar voiceCount: The number of available voices.
-        @type voiceCount: int
+        @ivar voice: Unique string identifying the current voice.
+        @type voice: str
+        @ivar availableVoices: The available voices.
+        @ivar availableVoices: [L{VoiceInfo}, ...]
         @ivar pitch: The current pitch; ranges between 0 and 100.
         @type pitch: int
@@ -123 +128 @@
         @ivar variant: The current variant of the voice.
         @type variant: str
-        @ivar variantCount: The number of available variants.
-        @type variantCount: int
+        @ivar availableVariants: The available variants of the voice.
+        @type availableVariants: [L{VoiceInfo}, ...]
         @ivar inflection: The current inflection; ranges between 0 and 100.
         @type inflection: int
@@ -158 +163 @@
                 return False
 
-        def initialize(self):
+        def __init__(self):
                 """Initialize this synth driver.
                 This method can also set default settings for the synthesizer.
@@ -164 +169 @@
                 @postcondition: This driver can be used.
                 """
+
 
         def terminate(self):
@@ -195 +201 @@
 
         def _get_voice(self):
-                return 1
+                raise NotImplementedError
 
         def _set_voice(self, value):
                 pass
 
-        def _get_voiceCount(self):
-                return 1
-
-        def getVoiceName(self, num):
-                return ""
+        def _getAvailableVoices(self):
+                """fetches a list of voices that the synth supports.
+                @returns: a list of L{VoiceInfo} instances representing the available voices
+                @rtype: list
+                """
+
+        def _get_availableVoices(self):
+                if not hasattr(self,'_availableVoices'):
+                        self._availableVoices=self._getAvailableVoices()
+                return self._availableVoices
 
         def _get_rate(self):
@@ -225 +236 @@
 
         def _get_variant(self):
-                return "none"
+                raise NotImplementedError
 
         def _set_variant(self, value):
                 pass
 
-        def _get_variantCount(self):
-                return 1
+        def _getAvailableVariants(self):
+                """fetches a list of variants that the synth supports.
+                @returns: a list of L{VoiceInfo} instances representing the available variants
+                @rtype: list
+                """
+ 
+        def _get_availableVariants(self):
+                if not hasattr(self,'_availableVariants'):
+                        self._availableVariants=self._getAvailableVariants()
+                return self._availableVariants
 
         def _get_inflection(self):
@@ -269 +288 @@
                 """
                 return int(round(float(percent) / 100 * (max - min) + min))
+
+        def getVoiceInfoByID(self,ID):
+                """Looks up a L{VoiceInfo} instance representing a particular voice, by its ID.
+                @param ID: the ID of the voice
+                @type ID: string
+                @returns: the voice info instance
+                @rtype: L{VoiceInfo}
+                @raise LookupError: If there was no such voice.
+                """
+                for v in self.availableVoices:
+                        if v.ID==ID:
+                                return v
+                raise LookupError("No such voice")
+
+class VoiceInfo(object):
+        """Provides information about a single synthesizer voice.
+        """
+
+        def __init__(self,ID,name):
+                #: The unique identifier of the voice.
+                #: @type: str
+                self.ID=ID
+                #: The name of the voice, visible to the user.
+                #: @type: str
+                self.name=name

trunk/source/synthDrivers/_espeak.py

@@ -143 +143 @@
         def run(self):
                 global isSpeaking
-                try:
-                        while True:
-                                func, args, kwargs = bgQueue.get()
-                                if not func:
-                                        break
+                while True:
+                        func, args, kwargs = bgQueue.get()
+                        if not func:
+                                break
+                        try:
                                 func(*args, **kwargs)
-                                bgQueue.task_done()
-                except:
-                        log.error("bgThread.run", exc_info=True)
+                        except:
+                                log.error("Error running function from queue", exc_info=True)
+                        bgQueue.task_done()
 
 def _bgExec(func, *args, **kwargs):

trunk/source/synthDrivers/audiologic.py

@@ -55 +55 @@
                 _audiologic.TtsStop()
 
+        def _getAvailableVoices(self):
+                return [SynthDriverHandler.VoiceInfo("", "Tts3")]
+
         def _get_voice(self):
-                return 1
-
-        def _get_voiceCount(self):
-                return 1
-
-        def getVoiceName(self,num):
-                return "Tts3"
+                return ""
 
         def _get_rate(self):

trunk/source/synthDrivers/espeak.py

@@ -30 +30 @@
                 lang=languageHandler.getLanguage()
                 _espeak.setVoiceByLanguage(lang)
-                self._voiceList=_espeak.getVoiceList()
                 self._variantDict=_espeak.getVariantDict()
                 self.variant="max"
@@ -36 +35 @@
                 self.pitch=40
                 self.inflection=75
-
 
         def speakText(self,text,index=None):
@@ -77 +75 @@
                 _espeak.setParameter(_espeak.espeakVOLUME,volume,0)
 
+        def _getAvailableVoices(self):
+                return [synthDriverHandler.VoiceInfo(voice.identifier, "%s (%s)" % (voice.name, voice.identifier)) for voice in _espeak.getVoiceList()]
+
         def _get_voice(self):
                 curVoice = _espeak.getCurrentVoice()
                 if not curVoice:
-                        return 0
-                for index, voice in enumerate(self._voiceList):
-                        if voice.identifier.split('+')[0] == curVoice.identifier.split('+')[0]:
-                                return index + 1
-                return 0
+                        return ""
+                return curVoice.identifier.split('+')[0]
 
-        def _set_voice(self, index):
-                if index == 0:
+        def _set_voice(self, identifier):
+                if not identifier:
                         return
-                _espeak.setVoiceAndVariant(voice=self._voiceList[index - 1].identifier)
-
-        def _get_voiceCount(self):
-                return len(self._voiceList)
-
-        def getVoiceName(self,num):
-                num=num-1
-                return "%s (%s)"%(self._voiceList[num].name,self._voiceList[num].identifier)
+                _espeak.setVoiceAndVariant(voice=identifier)
 
         def _get_lastIndex(self):
@@ -111 +102 @@
                 _espeak.setVoiceAndVariant(variant=val)
 
-        def _get_variantCount(self):
-                return len(self._variantDict)
-
-        def getVariantName(self,num):
-                return self._variantDict.values()[num]
-
-        def getVariantIdentifier(self,num):
-                return self._variantDict.keys()[num]
+        def _getAvailableVariants(self):
+                return [synthDriverHandler.VoiceInfo(ID, name) for ID, name in self._variantDict.iteritems()]

trunk/source/synthDrivers/sapi4.py

@@ -64 +64 @@
                 if len(self._enginesList)==0:
                         raise RuntimeError("No Sapi4 engines available")
-                self.voice=1
+                self.voice=str(self._enginesList[0].gModeID)
 
         def speakText(self,text,index=None):
+                flags=0
                 if index is not None:
-                        text="\mrk=%d\\%s"%(index,text)
-                self._ttsCentral.TextData(VOICECHARSET.CHARSET_TEXT, TTSDATAFLAG_TAGGED,TextSDATA(text),self._bufSink._com_pointers_[ITTSBufNotifySink._iid_],ITTSBufNotifySink._iid_)
+                        text="\mrk=%d\\%s"%(index,text.replace('\\','\\\\'))
+                        flags+=TTSDATAFLAG_TAGGED
+                self._ttsCentral.TextData(VOICECHARSET.CHARSET_TEXT, flags,TextSDATA(text),self._bufSink._com_pointers_[ITTSBufNotifySink._iid_],ITTSBufNotifySink._iid_)
 
         def cancel(self):
@@ -81 +83 @@
 
         def _set_voice(self,val):
-                self._voice=val-1
+                try:
+                        val=GUID(val)
+                except:
+                        val=self._enginesList[0].gModeID
+                mode=None
+                for mode in self._enginesList:
+                        if mode.gModeID==val:
+                                break
+                if mode is None:
+                        raise ValueError("no such mode: %s"%val)
+                self._currentMode=mode
                 self._ttsAudio=CoCreateInstance(CLSID_MMAudioDest,IAudioMultiMediaDevice)
                 self._ttsAudio.DeviceNumSet(nvwave.outputDeviceNameToID(config.conf["speech"]["outputDevice"], True))
                 self._ttsCentral=POINTER(ITTSCentralW)()
-                self._ttsEngines.Select(self._enginesList[self._voice].gModeID,byref(self._ttsCentral),self._ttsAudio)
+                self._ttsEngines.Select(self._currentMode.gModeID,byref(self._ttsCentral),self._ttsAudio)
                 self._tt

@@ -1 @@
-timestamp: 2008-11-06 17:51:53.163000107 +1000
+timestamp: 2008-11-09 22:45:27.869999886 +1100
 committer: James Teh <jamie@jantrid.net>
 properties: 

@@ -12 +12 @@
 jamie@jantrid.net-20081022055144-zd6v96gjzz94ript
 jamie@jantrid.net-20081104100702-aqivw5dfzmygyo17
+jamie@jantrid.net-20081109113343-zabfejnnivsxf2gd

@@ -251 +251 @@
 2279 jamie@jantrid.net-20081106071205-mve6ffhfpwjrngz8
 2280 jamie@jantrid.net-20081106075153-p4o534murjkdzapb
+2281 jamie@jantrid.net-20081109114527-f0kqf0o8k8713bsc

@@ -1 @@
-source/generate.py      343@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Fgenerate.py
+source/config/__init__.py       46@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Fconfig%2F__init__.py
+source/gui/settingsDialogs.py   299@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Fgui%2FsettingsDialogs.py
+source/synthDriverHandler.py    97@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FsynthDriverHandler.py
+source/synthDrivers/_espeak.py  612@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FsynthDrivers%2F_espeak.py
+source/synthDrivers/audiologic.py       audiologic.py-20080701031200-sjkq3p9snm96sxhq-2
+source/synthDrivers/espeak.py   612@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FsynthDrivers%2Fespeak.py
+source/synthDrivers/sapi4.py    sapi4.py-20081105062308-fz5mgli5iso5vcdq-2
+source/synthDrivers/sapi5.py    94@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FsynthDrivers%2Fsapi5.py
+source/synthSettingsRing.py     1111@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2F_synthSettingsRing.py
+user_docs/whats%20new.txt       559@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:user_docs%2Fwhats%20new.txt

@@ +1 @@
+source/config/__init__.py       mick@kulgan.net-20081106053934-wy7im3e0a4n01gd5
+source/gui/settingsDialogs.py   jamie@jantrid.net-20081109091405-cr7i6qx0r32qxzv2
+source/synthDriverHandler.py    jamie@jantrid.net-20081109113343-zabfejnnivsxf2gd
+source/synthDrivers/_espeak.py  jamie@jantrid.net-20081106064553-6iftm4vexioo630i
+source/synthDrivers/audiologic.py       jamie@jantrid.net-20081109052259-kxgyslupb8qa1jye
+source/synthDrivers/espeak.py   jamie@jantrid.net-20081109052655-7z096nch59fgwzl5
+source/synthDrivers/sapi4.py    mick@kulgan.net-20081109055011-8tcy3vfb69sjdwge
+source/synthDrivers/sapi5.py    jamie@jantrid.net-20081109052259-kxgyslupb8qa1jye
+source/synthSettingsRing.py     jamie@jantrid.net-20081109100954-vzi0052zk64nib6y
+user_docs/whats%20new.txt       jamie@jantrid.net-20081109105054-ollwznuzdm6qy6ho