fix compatibility for NVDA 2021.1, currently in alpha version. Now speech commands and BooleanDriverSetting,NumericDriverSettingare properly imported.

merged all changes from CyrilleB79, @Mohamed00 and ultrasound1372
update buildVars.py to reflect the new version

Author: davidacm

.gitignore

@@ -7,4 +7,6 @@ addon/synthDrivers/ibmtts
 *.mo
 *.py[co]
 *.nvda-addon
+*.code-workspace
+setup.cfg
 .sconsign.dblite

addon/synthDrivers/ibmeci.py

@@ -3,19 +3,31 @@
 # Author: David CM <dhf360@gmail.com> and others.
 #synthDrivers/ibmeci.py
 
-import six, synthDriverHandler, speech, languageHandler, config, os, re
+import six, synthDriverHandler, languageHandler, config, os, re
+from synthDriverHandler import synthDoneSpeaking, SynthDriver, synthIndexReached, VoiceInfo
+
 from collections import OrderedDict
 from six import string_types
-from synthDriverHandler import SynthDriver,VoiceInfo
 from logHandler import log
+
 from synthDrivers import _ibmeci
-from synthDrivers._ibmeci import ECIVoiceParam
-from synthDrivers._ibmeci import isIBM
+from synthDrivers._ibmeci import ECIVoiceParam, isIBM
+
+
+# compatibility with nvda 2021.1 alpha versions.
+try:
+	from speech.commands import BreakCommand, CharacterModeCommand, IndexCommand, LangChangeCommand, PitchCommand, RateCommand, VolumeCommand
+except ImportError:
+	from speech import BreakCommand, CharacterModeCommand, IndexCommand, LangChangeCommand, PitchCommand, RateCommand, VolumeCommand
+
+try:
+	from autoSettingsUtils.driverSetting import BooleanDriverSetting,NumericDriverSetting
+except ImportError:
+	from driverHandler import BooleanDriverSetting,NumericDriverSetting
+
 import addonHandler
 addonHandler.initTranslation()
 
-from driverHandler import BooleanDriverSetting,NumericDriverSetting
-from synthDriverHandler import synthIndexReached, synthDoneSpeaking
 
 minRate=40
 maxRate=156
@@ -138,13 +150,13 @@ class SynthDriver(synthDriverHandler.SynthDriver):
 		BooleanDriverSetting("shortpause", _("&Shorten pauses"), False),
 		BooleanDriverSetting("sendParams", _("Always Send Current Speech Settings (enable to prevent some tags from sticking, disable for viavoice binary compatibility)"), False))
 	supportedCommands = {
-		speech.IndexCommand,
-		speech.CharacterModeCommand,
-		speech.LangChangeCommand,
-		speech.BreakCommand,
-		speech.PitchCommand,
-		speech.RateCommand,
-		speech.VolumeCommand
+		IndexCommand,
+		CharacterModeCommand,
+		LangChangeCommand,
+		BreakCommand,
+		PitchCommand,
+		RateCommand,
+		VolumeCommand
 	}
 	supportedNotifications = {synthIndexReached, synthDoneSpeaking}
 
@@ -168,9 +180,9 @@ def __init__(self):
 		self.currentEncoding = "mbcs"
 
 	PROSODY_ATTRS = {
-		speech.PitchCommand: ECIVoiceParam.eciPitchBaseline,
-		speech.VolumeCommand: ECIVoiceParam.eciVolume,
-		speech.RateCommand: ECIVoiceParam.eciSpeed,
+		PitchCommand: ECIVoiceParam.eciPitchBaseline,
+		VolumeCommand: ECIVoiceParam.eciVolume,
+		RateCommand: ECIVoiceParam.eciSpeed,
 	}
 
 	def speak(self,speechSequence):
@@ -183,9 +195,9 @@ def speak(self,speechSequence):
 				s = self.processText(item)
 				outlist.append((_ibmeci.speak, (s,)))
 				last = s
-			elif isinstance(item,speech.IndexCommand):
+			elif isinstance(item,IndexCommand):
 				outlist.append((_ibmeci.index, (item.index,)))
-			elif isinstance(item,speech.LangChangeCommand):
+			elif isinstance(item,LangChangeCommand):
 				l=None
 				if item.lang in langsAnnotations: l = langsAnnotations[item.lang]
 				elif item.lang and item.lang[0:2] in langsAnnotations: l = langsAnnotations[item.lang[0:2]]
@@ -197,11 +209,11 @@ def speak(self,speechSequence):
 				else:
 					outlist.append((_ibmeci.speak, (langsAnnotations[defaultLanguage],)))
 					self.speakingLanguage = defaultLanguage
-			elif isinstance(item,speech.CharacterModeCommand):
+			elif isinstance(item,CharacterModeCommand):
 				outlist.append((_ibmeci.speak, (b"`ts1" if item.state else b"`ts0",)))
 				if item.state:
 					charmode=True
-			elif isinstance(item,speech.BreakCommand):
+			elif isinstance(item,BreakCommand):
 				# taken from eloquence_threshold (https://github.com/pumper42nickel/eloquence_threshold)
 				# Eloquence doesn't respect delay time in milliseconds.
 				# Therefore we need to adjust waiting time depending on current speech rate
@@ -232,7 +244,7 @@ def speak(self,speechSequence):
 				outlist.append((_ibmeci.speak, (b' `p%d '%(pFactor),)))
 			elif type(item) in self.PROSODY_ATTRS:
 				val = max(0, min(item.newValue, 100))
-				if type(item) == speech.RateCommand: val = self.percentToRate(val)
+				if type(item) == RateCommand: val = self.percentToRate(val)
 				outlist.append((_ibmeci.setProsodyParam, (self.PROSODY_ATTRS[type(item)], val)))
 			else:
 				log.error("Unknown speech: %s"%item)
@@ -443,4 +455,4 @@ def _onDoneSpeaking(self): synthDoneSpeaking.notify(synth=self)
 def resub(dct, s):
 	for r in six.iterkeys(dct):
 		s = r.sub(dct[r], s)
-	return s
+	return s

buildVars.py

@@ -19,17 +19,17 @@
 	# Translators: Long description to be shown for this add-on on add-on information from add-ons manager
 	"addon_description" : _("""This is the IBMTTS synthesizer driver for NVDA."""),
 	# version
-	"addon_version" : "21.01-x0_personal",
+	"addon_version" : "21.03a1",
 	# Author(s)
 	"addon_author" : u"David CM <dhf360@gmail.com>, x0 and others",
 	# URL for the add-on documentation support
-	"addon_url" : "https://github.com/ultrasound1372/NVDA-IBMTTS-Driver",
+	"addon_url" : "https://github.com/davidacm/NVDA-IBMTTS-Driver",
 	# Documentation file name
 	"addon_docFileName" : "readme.html",
 	# Minimum NVDA version supported (e.g. "2018.3.0")
 	"addon_minimumNVDAVersion" : "2019.3.0",
 	# Last NVDA version supported/tested (e.g. "2018.4.0", ideally more recent than minimum version)
-	"addon_lastTestedNVDAVersion" : "2020.4.0",
+	"addon_lastTestedNVDAVersion" : "2021.1.0",
 	# Add-on update channel (default is stable or None)
 	"addon_updateChannel" : None,
 }