version 4.6

Many works has done to prevent fatal error in using various SAPI 5 voices. Furthermore, now if any fatal error occure in speaking the dual voice will change the synthesizer to espeak.

Author: Mahmood-Taghavi

addon/globalPlugins/dual_voice_globalPlugin/__init__.py

@@ -1,20 +1,17 @@
-# https://github.com/Mahmood-Taghavi
+# -*- coding: UTF-8 -*-
+#A part of Dual Voice for NVDA
+#Copyright (C) 2015-2020 Seyed Mahmood Taghavi Shahri
+#https://mahmood-taghavi.github.io/dual_voice/
+#This file is covered by the GNU General Public License version 3.
+#See the file COPYING for more details.
 
 import globalPluginHandler, wx, gui
 from .dialogs import *
 import webbrowser
+import addonHandler
+addonHandler.initTranslation()
 import config
-
-confspec = {
-	"sapi5SecondVoice": "string(default='')",
-	"sapi5SecondRate": "integer(default=50)",
-	"sapi5SecondPitch": "integer(default=50)",
-	"sapi5SecondVolume": "integer(default=100)",
-	"sapi5SecondIsLatin": "boolean(default=False)",
-	"sapi5NonLatinPriority": "boolean(default=False)",
-	"sapi5ConsiderContext": "boolean(default=False)",
-}
-config.conf.spec["dual_voice"] = confspec
+from synthDrivers import _realtime
 
 class GlobalPlugin (globalPluginHandler.GlobalPlugin):
 	def __init__(self):
@@ -32,7 +29,7 @@ def createMenu(self):
 		self.submenu_item = gui.mainFrame.sysTrayIcon.menu.InsertMenu(2, wx.ID_ANY, _("Dual &voice"), self.submenu_dualvoice)
 
 	def onAbout(self, event):
-		gui.messageBox("Version 4.5 by Seyed Mahmood Taghavi-Shahri", _("About the Dual voice add-on for NVDA"), wx.OK)
+		gui.messageBox("Version 4.6 by Seyed Mahmood Taghavi-Shahri", _("About the Dual voice add-on for NVDA"), wx.OK)
 
 
 	def onCheckUpdate(self, event):

addon/globalPlugins/dual_voice_globalPlugin/dialogs.py

@@ -1,10 +1,14 @@
-# https://github.com/Mahmood-Taghavi
+# -*- coding: UTF-8 -*-
+#A part of Dual Voice for NVDA
+#Copyright (C) 2015-2020 Seyed Mahmood Taghavi Shahri
+#https://mahmood-taghavi.github.io/dual_voice/
+#This file is covered by the GNU General Public License version 3.
+#See the file COPYING for more details.
 
-#from collections import defaultdict
 import wx
 import gui
-#import addonHandler
-#addonHandler.initTranslation()
+import addonHandler
+addonHandler.initTranslation()
 import config
 
 #import languageHandler
@@ -15,32 +19,9 @@
 
 class DualVoiceLanguageSettingsDialog(gui.SettingsDialog):
 	title = _('The "Dual Voice" settings')
-	_tempSecondVoice = ''
-	_tempSecondRate = 50
-	_tempSecondPitch = 50
-	_tempSecondVolume = 100
-	_tempSecondIsLatin = False
-	_tempNonLatinPriority = False
-	_tempConsiderContext = False
 	def __init__(self, parent):
 		super(DualVoiceLanguageSettingsDialog, self).__init__(parent)
-		global _tempSecondVoice
-		global _tempSecondRate
-		global _tempSecondPitch
-		global _tempSecondVolume
-		global _tempSecondIsLatin
-		global _tempNonLatinPriority
-		global _tempConsiderContext
 		#_realtime.typingArea = "Alaki"
-		if ("dual_sapi5" in speech.getSynth().name):
-			#config.conf["dual_voice"]["tempSecondVoice"] = config.conf["dual_voice"]["sapi5SecondVoice"]
-			_tempSecondVoice = config.conf["dual_voice"]["sapi5SecondVoice"]
-			_tempSecondRate = config.conf["dual_voice"]["sapi5SecondRate"]
-			_tempSecondPitch = config.conf["dual_voice"]["sapi5SecondPitch"]
-			_tempSecondVolume = config.conf["dual_voice"]["sapi5SecondVolume"]
-			_tempSecondIsLatin = config.conf["dual_voice"]["sapi5SecondIsLatin"]
-			_tempNonLatinPriority = config.conf["dual_voice"]["sapi5NonLatinPriority"]
-			_tempConsiderContext = config.conf["dual_voice"]["sapi5ConsiderContext"]		
 
 	def makeSettings(self, sizer):
 		synthInfo = _('Your current speech synthesizer is the %. Please select the Dual Voice as the speech synthesizer in the NVDA speech settings.')
@@ -51,14 +32,10 @@ def makeSettings(self, sizer):
 		else:
 			## find the primary voice and show it in a label      
 			try:
-				primaryVoiceID = config.conf["speech"]["dual_sapi5"]["voice"]
-				index = _realtime.list_VoiceID.index(primaryVoiceID)
+				index = _realtime.list_VoiceID.index(_realtime.primaryVoiceID)
 				voiceName = _realtime.list_VoiceName[index]
 			except:
-				config.conf["speech"]["dual_sapi5"]["voice"] = _realtime.list_VoiceID[0]
-				primaryVoiceID = config.conf["speech"]["dual_sapi5"]["voice"]
-				index = _realtime.list_VoiceID.index(primaryVoiceID)
-				voiceName = _realtime.list_VoiceName[index]
+				voiceName = 'a voice without the required name attribute'
 			voiceInfo = _('You have selected % as the primary voice.')
 			voiceInfo = voiceInfo.replace('%', voiceName)
 			infoLabel = wx.StaticText(self, label = voiceInfo)
@@ -70,15 +47,15 @@ def makeSettings(self, sizer):
 			sizer.Add(sVoicesLabel)	
 			self._sVoicesChoice = wx.Choice(self, choices = _realtime.list_VoiceName)
 			if ("dual_sapi5" in speech.getSynth().name):
-				check = config.conf["dual_voice"]["sapi5SecondVoice"] in _realtime.list_VoiceAttribName
+				check = _realtime.sapi5SecondVoice in _realtime.list_VoiceAttribName
 				if check:
-					index = _realtime.list_VoiceAttribName.index(config.conf["dual_voice"]["sapi5SecondVoice"])
+					index = _realtime.list_VoiceAttribName.index(_realtime.sapi5SecondVoice)
 					self._sVoicesChoice.SetSelection(index)
 				else:
 					#self._sVoicesChoice.SetSelection(0)
-					check = config.conf["speech"]["dual_sapi5"]["voice"] in _realtime.list_VoiceID
+					check = _realtime.primaryVoiceID in _realtime.list_VoiceID
 					if check:
-						index = _realtime.list_VoiceID.index(config.conf["speech"]["dual_sapi5"]["voice"])
+						index = _realtime.list_VoiceID.index(_realtime.primaryVoiceID)
 						self._sVoicesChoice.SetSelection(index)
 					else:
 						self._sVoicesChoice.SetSelection(0)
@@ -87,7 +64,7 @@ def makeSettings(self, sizer):
 			##
 			self._secondIsLatinCheckBox = wx.CheckBox(self, label = _("&Use the secondary voice for reading Latin text instead of non-Latin."))
 			if ("dual_sapi5" in speech.getSynth().name):
-				self._secondIsLatinCheckBox.SetValue(config.conf["dual_voice"]["sapi5SecondIsLatin"])
+				self._secondIsLatinCheckBox.SetValue(_realtime.sapi5SecondIsLatin)
 			self._secondIsLatinCheckBox.Bind(wx.EVT_CHECKBOX, self.onSIsLatinCheck)
 			sizer.Add(self._secondIsLatinCheckBox)					
 			##
@@ -96,33 +73,33 @@ def makeSettings(self, sizer):
 			self._sRateSlider = wx.Slider(self, value = 50, minValue = 0, maxValue = 100, style = wx.SL_HORIZONTAL)	
 			self._sRateSlider.Bind(wx.EVT_SLIDER, self.OnSRateSliderScroll)
 			if ("dual_sapi5" in speech.getSynth().name):
-				self._sRateSlider.SetValue(config.conf["dual_voice"]["sapi5SecondRate"])
+				self._sRateSlider.SetValue(_realtime.sapi5SecondRate)
 			sizer.Add(self._sRateSlider)
 			##
 			sPitchLabel = wx.StaticText(self, label=_("&Pitch:"))
 			sizer.Add(sPitchLabel)
 			self._sPitchSlider = wx.Slider(self, value = 50, minValue = 0, maxValue = 100, style = wx.SL_HORIZONTAL)
 			self._sPitchSlider.Bind(wx.EVT_SLIDER, self.OnSPitchSliderScroll)
 			if ("dual_sapi5" in speech.getSynth().name):
-				self._sPitchSlider.SetValue(config.conf["dual_voice"]["sapi5SecondPitch"])
+				self._sPitchSlider.SetValue(_realtime.sapi5SecondPitch)
 			sizer.Add(self._sPitchSlider)
 			##
 			sVolumeLabel = wx.StaticText(self, label=_("V&olume:"))
 			sizer.Add(sVolumeLabel)
 			self._sVolumeSlider = wx.Slider(self, value = 100, minValue = 0, maxValue = 100, style = wx.SL_HORIZONTAL)				
 			self._sVolumeSlider.Bind(wx.EVT_SLIDER, self.OnSVolumeSliderScroll)
 			if ("dual_sapi5" in speech.getSynth().name):
-				self._sVolumeSlider.SetValue(config.conf["dual_voice"]["sapi5SecondVolume"])			
+				self._sVolumeSlider.SetValue(_realtime.sapi5SecondVolume)			
 			sizer.Add(self._sVolumeSlider)
 			##
 			self._nonLatinPriorityCheckBox = wx.CheckBox(self, label = _("&Prioritize non-Latin text over Latin text."))
 			if ("dual_sapi5" in speech.getSynth().name):
-				self._nonLatinPriorityCheckBox.SetValue(config.conf["dual_voice"]["sapi5NonLatinPriority"])
+				self._nonLatinPriorityCheckBox.SetValue(_realtime.sapi5NonLatinPriority)
 			self._nonLatinPriorityCheckBox.Bind(wx.EVT_CHECKBOX, self.nonLatinPriorityCheck)
 			sizer.Add(self._nonLatinPriorityCheckBox)
-			self._considerContextCheckBox = wx.CheckBox(self, label = _("Read &numbers and punctuations based on context."))	
+			self._considerContextCheckBox = wx.CheckBox(self, label = _("Read &numbers and punctuations based on their context."))	
 			if ("dual_sapi5" in speech.getSynth().name):
-				self._considerContextCheckBox.SetValue(config.conf["dual_voice"]["sapi5ConsiderContext"])							
+				self._considerContextCheckBox.SetValue(_realtime.sapi5ConsiderContext)							
 			self._considerContextCheckBox.Bind(wx.EVT_CHECKBOX, self.considerContextCheck)
 			sizer.Add(self._considerContextCheckBox)			
 			##
@@ -154,45 +131,54 @@ def onOk(self, event):
 		# Update Configurations
 		if ("dual_sapi5" in speech.getSynth().name):				
 			_realtime.typingArea = self._typingAreaTextCtrl.GetValue()
+			config.conf["dual_voice"]["sapi5SecondVoice"] = _realtime.sapi5SecondVoice
+			config.conf["dual_voice"]["sapi5SecondRate"] = _realtime.sapi5SecondRate
+			config.conf["dual_voice"]["sapi5SecondPitch"] = _realtime.sapi5SecondPitch
+			config.conf["dual_voice"]["sapi5SecondVolume"] = _realtime.sapi5SecondVolume
+			config.conf["dual_voice"]["sapi5SecondIsLatin"] = _realtime.sapi5SecondIsLatin
+			config.conf["dual_voice"]["sapi5NonLatinPriority"] = _realtime.sapi5NonLatinPriority
+			config.conf["dual_voice"]["sapi5ConsiderContext"] = _realtime.sapi5ConsiderContext
+			
 		return super(DualVoiceLanguageSettingsDialog, self).onOk(event)
 
 	def onCancel(self, event):
 		# Restore Configurations
 		if ("dual_sapi5" in speech.getSynth().name):
-			config.conf["dual_voice"]["sapi5SecondVoice"] = _tempSecondVoice
-			config.conf["dual_voice"]["sapi5SecondRate"] = _tempSecondRate
-			config.conf["dual_voice"]["sapi5SecondPitch"] = _tempSecondPitch
-			config.conf["dual_voice"]["sapi5SecondVolume"] = _tempSecondVolume
-			config.conf["dual_voice"]["sapi5SecondIsLatin"] = _tempSecondIsLatin
-			config.conf["dual_voice"]["sapi5NonLatinPriority"] = _tempNonLatinPriority
-			config.conf["dual_voice"]["sapi5ConsiderContext"] = _tempConsiderContext
+			_realtime.sapi5SecondVoice = config.conf["dual_voice"]["sapi5SecondVoice"]
+			_realtime.sapi5SecondRate = config.conf["dual_voice"]["sapi5SecondRate"]
+			_realtime.sapi5SecondPitch = config.conf["dual_voice"]["sapi5SecondPitch"]
+			_realtime.sapi5SecondVolume = config.conf["dual_voice"]["sapi5SecondVolume"]
+			_realtime.sapi5SecondIsLatin = config.conf["dual_voice"]["sapi5SecondIsLatin"]
+			_realtime.sapi5NonLatinPriority = config.conf["dual_voice"]["sapi5NonLatinPriority"]
+			_realtime.sapi5ConsiderContext = config.conf["dual_voice"]["sapi5ConsiderContext"]
 		return super(DualVoiceLanguageSettingsDialog, self).onCancel(event)
 
 
 	def onSVoiceChange(self, event):
 		if ("dual_sapi5" in speech.getSynth().name):
-			config.conf["dual_voice"]["sapi5SecondVoice"] = _realtime.list_VoiceAttribName[self._sVoicesChoice.GetSelection()]
+			_realtime.sapi5SecondVoice = _realtime.list_VoiceAttribName[self._sVoicesChoice.GetSelection()]
+			_realtime.problemisticSapi5SecondVoice = ''
 
 	def OnSRateSliderScroll(self, event):
 		if ("dual_sapi5" in speech.getSynth().name):
-			config.conf["dual_voice"]["sapi5SecondRate"] = self._sRateSlider.GetValue()
+			_realtime.sapi5SecondRate = self._sRateSlider.GetValue()
 
 	def OnSPitchSliderScroll(self, event):
 		if ("dual_sapi5" in speech.getSynth().name):
-			config.conf["dual_voice"]["sapi5SecondPitch"] = self._sPitchSlider.GetValue()
+			_realtime.sapi5SecondPitch = self._sPitchSlider.GetValue()
 
 	def OnSVolumeSliderScroll(self, event):
 		if ("dual_sapi5" in speech.getSynth().name):
-			config.conf["dual_voice"]["sapi5SecondVolume"] = self._sVolumeSlider.GetValue()
+			_realtime.sapi5SecondVolume = self._sVolumeSlider.GetValue()
 
 	def onSIsLatinCheck(self, event):
 		if ("dual_sapi5" in speech.getSynth().name):
-			config.conf["dual_voice"]["sapi5SecondIsLatin"] = self._secondIsLatinCheckBox.GetValue()
+			_realtime.sapi5SecondIsLatin = self._secondIsLatinCheckBox.GetValue()
 
 	def nonLatinPriorityCheck(self, event):
 		if ("dual_sapi5" in speech.getSynth().name):
-			config.conf["dual_voice"]["sapi5NonLatinPriority"] = self._nonLatinPriorityCheckBox.GetValue()	
+			_realtime.sapi5NonLatinPriority = self._nonLatinPriorityCheckBox.GetValue()	
 
 	def considerContextCheck(self, event):
 		if ("dual_sapi5" in speech.getSynth().name):
-			config.conf["dual_voice"]["sapi5ConsiderContext"] = self._considerContextCheckBox.GetValue()
+			_realtime.sapi5ConsiderContext = self._considerContextCheckBox.GetValue()

addon/synthDrivers/_dual_sapi5.py

@@ -1,33 +1,31 @@
-# -*- coding: utf-8 -*-
-# Dual voice Add-on for NVDA.
-# Copyright (C) 2015 Seyed Mahmood Taghavi-Shahri.
-# This file is covered by the GNU General Public License.
-# This code initially developed for Persian (Farsi) language.
-# Release: 2015-01-31	Version: 3.0
-# Project homepage: http://dualvoice.sf.net
-# This file contain functions for natural language processing.
-import config
+# -*- coding: UTF-8 -*-
+#A part of Dual Voice for NVDA
+#Copyright (C) 2015-2020 Seyed Mahmood Taghavi Shahri
+#https://mahmood-taghavi.github.io/dual_voice/
+#This file is covered by the GNU General Public License version 3.
+#See the file COPYING for more details.
+
+#import config
 from synthDrivers import _realtime
 from . import _dualvoice
 
 def nlp(text):
-	SecondVoice = config.conf["dual_voice"]["sapi5SecondVoice"]
+	SecondVoice = _realtime.sapi5SecondVoice
 	if SecondVoice=="":
-		primaryVoiceID = config.conf["speech"]["dual_sapi5"]["voice"]
-		index = _realtime.list_VoiceID.index(primaryVoiceID)
+		index = _realtime.list_VoiceID.index(_realtime.primaryVoiceID)
 		voiceAttribName = _realtime.list_VoiceAttribName[index]
 		SecondVoice = voiceAttribName # use the name attribute value of the primary voice as the secondary voice name.
-	SecondVolume = str(config.conf["dual_voice"]["sapi5SecondVolume"])
-	SecondRate = str(round((config.conf["dual_voice"]["sapi5SecondRate"]-50)/5))
-	SecondPitch = str(round((config.conf["dual_voice"]["sapi5SecondPitch"]-50)/5))
-	latinPriority = (config.conf["dual_voice"]["sapi5NonLatinPriority"]==False)
-	considerContext = config.conf["dual_voice"]["sapi5ConsiderContext"]
+	SecondVolume = str(_realtime.sapi5SecondVolume)
+	SecondRate = str(round((_realtime.sapi5SecondRate-50)/5))
+	SecondPitch = str(round((_realtime.sapi5SecondPitch-50)/5))
+	latinPriority = (_realtime.sapi5NonLatinPriority==False)
+	considerContext = _realtime.sapi5ConsiderContext
 	nonLatinStartTag = ' <voice required="Name=' + SecondVoice + '"> <volume level="' + SecondVolume + '"> <rate absspeed="' + SecondRate + '"> <pitch absmiddle="' + SecondPitch + '"> '
 	nonLatinEndTag = ' </pitch> </rate> </volume> </voice> '
 	FirstVolume = str(_realtime.sapi5FirstVolume)
 	LatinStartTag = '<volume level="' + FirstVolume + '">'
 	LatinEndTag = '</volume>'
-	if config.conf["dual_voice"]["sapi5SecondIsLatin"] == False:
+	if _realtime.sapi5SecondIsLatin == False:
 		return _dualvoice.nlp(text,latinPriority,considerContext,nonLatinStartTag,nonLatinEndTag,LatinStartTag,LatinEndTag)
 	else:
 		return _dualvoice.nlp(text,latinPriority,considerContext,LatinStartTag,LatinEndTag,nonLatinStartTag,nonLatinEndTag)

addon/synthDrivers/_dualvoice.py

@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
-# Dual voice Add-on for NVDA.
-# Copyright (C) 2015 Seyed Mahmood Taghavi-Shahri.
-# This file is covered by the GNU General Public License.
-# This code initially developed for Persian (Farsi) language.
-# Release: 2015-01-31	Version: 3.0
-# Project homepage: http://dualvoice.sf.net
-# This file contain functions for natural language processing.
+# -*- coding: UTF-8 -*-
+#A part of Dual Voice for NVDA
+#Copyright (C) 2015-2020 Seyed Mahmood Taghavi Shahri
+#https://mahmood-taghavi.github.io/dual_voice/
+#This file is covered by the GNU General Public License version 3.
+#See the file COPYING for more details.
 
 def charactertype(character):
     character.encode('utf-8')

addon/synthDrivers/_realtime.py

@@ -1,8 +1,24 @@
-# https://github.com/Mahmood-Taghavi
+# -*- coding: UTF-8 -*-
+#A part of Dual Voice for NVDA
+#Copyright (C) 2015-2020 Seyed Mahmood Taghavi Shahri
+#https://mahmood-taghavi.github.io/dual_voice/
+#This file is covered by the GNU General Public License version 3.
+#See the file COPYING for more details.
+
 typingArea = "You can type here to check the voices"
 list_VoiceAttribName = []
 list_VoiceID = []
 list_VoiceName = []
 list_VoiceLang = []
 sapi5FirstVolume = 100
 tempStringVar = ''
+sapi5SecondVoice = ''
+sapi5SecondRate = 50
+sapi5SecondPitch = 50
+sapi5SecondVolume = 100
+sapi5SecondIsLatin = False
+sapi5NonLatinPriority = False
+sapi5ConsiderContext = False
+primaryVoiceID = ''
+problemisticSapi5SecondVoice = ''
+problemisticPrimaryVoiceID = ''