Merge 2ffc74b into 3f89b60

seanbudd · web-flow · commit 23a5c5766bba · 2023-06-29T15:07:55.000+10:00
diff --git a/source/config/__init__.py b/source/config/__init__.py
@@ -39,6 +39,7 @@
 from .featureFlag import (
 	_transformSpec_AddFeatureFlagDefault,
 	_validateConfig_featureFlag,
+	FeatureFlag,
 )
 from typing import (
 	Any,
@@ -1247,13 +1248,17 @@ def __setitem__(
 		except KeyError:
 			pass
 		else:
-			if self._isSection(val) or self._isSection(curVal):
-				# If value is a section, continue to update
-				pass
-			elif str(val) == str(curVal):
+			if (
+				# Feature flags override __eq__.
 				# Check str comparison as this is what is written to the config.
 				# If the value is unchanged, do not update
 				# or mark the profile as dirty.
+				(
+					isinstance(val, FeatureFlag)
+					or isinstance(curVal, FeatureFlag)
+				)
+				and str(val) == str(curVal)
+			):
 				return
 
 		# Set this value in the most recently activated profile.
diff --git a/source/synthDriverHandler.py b/source/synthDriverHandler.py
@@ -428,8 +428,9 @@ def getSynth() -> Optional[SynthDriver]:
 
 
 def getSynthInstance(name, asDefault=False):
+	from synthDrivers.oneCore import OneCoreSynthDriver
 	newSynth: SynthDriver = _getSynthDriver(name)()
-	if asDefault and newSynth.name == 'oneCore':
+	if asDefault and isinstance(newSynth, OneCoreSynthDriver):
 		# Will raise an exception if oneCore does not support the system language
 		newSynth._getDefaultVoice(pickAny=False)
 	newSynth.initSettings()
diff --git a/source/synthDrivers/espeak.py b/source/synthDrivers/espeak.py
@@ -422,10 +422,10 @@ def _set_inflection(self,val):
 		val=self._percentToParam(val, _espeak.minPitch, _espeak.maxPitch)
 		_espeak.setParameter(_espeak.espeakRANGE,val,0)
 
-	def _get_volume(self):
+	def _get_volume(self) -> int:
 		return _espeak.getParameter(_espeak.espeakVOLUME,1)
 
-	def _set_volume(self,volume):
+	def _set_volume(self, volume: int):
 		_espeak.setParameter(_espeak.espeakVOLUME,volume,0)
 
 	def _getAvailableVoices(self):
diff --git a/source/synthDrivers/oneCore.py b/source/synthDrivers/oneCore.py
@@ -222,9 +222,9 @@ def __init__(self):
 		# Set initial values for parameters that can't be queried when prosody is not supported.
 		# This initialises our cache for the value.
 		# When prosody is supported, the values are used for cachign reasons.
-		self._rate = 50
-		self._pitch = 50
-		self._volume = 100
+		self._rate: int = 50
+		self._pitch: int = 50
+		self._volume: int = 100
 
 		if self.supportsProsodyOptions:
 			self._dll.ocSpeech_getPitch.restype = ctypes.c_double
@@ -339,13 +339,13 @@ def _set_pitch(self, pitch):
 		rawPitch = self._percentToParam(pitch, self.MIN_PITCH, self.MAX_PITCH)
 		self._queuedSpeech.append((self._dll.ocSpeech_setPitch, rawPitch))
 
-	def _get_volume(self):
+	def _get_volume(self) -> int:
 		if not self.supportsProsodyOptions:
 			return self._volume
 		rawVolume = self._dll.ocSpeech_getVolume(self._ocSpeechToken)
 		return int(rawVolume * 100)
 
-	def _set_volume(self, volume):
+	def _set_volume(self, volume: int):
 		self._volume = volume
 		if not self.supportsProsodyOptions:
 			return
diff --git a/source/synthDrivers/sapi5.py b/source/synthDrivers/sapi5.py
@@ -163,7 +163,7 @@ def _get_rate(self):
 	def _get_pitch(self):
 		return self._pitch
 
-	def _get_volume(self):
+	def _get_volume(self) -> int:
 		return self.tts.volume
 
 	def _get_voice(self):
