Merge 5a8d539 into 69c8c5b

LeonarddeR · web-flow · commit ee2ef6db67dd · 2023-09-23T20:08:51.000+10:00
diff --git a/source/synthDrivers/sapi4.py b/source/synthDrivers/sapi4.py
@@ -45,7 +45,9 @@
 	PitchCommand,
 	RateCommand,
 	VolumeCommand,
+	BaseProsodyCommand
 )
+from speech.types import SpeechSequence
 
 
 class SynthDriverBufSink(COMObject):
@@ -124,14 +126,23 @@ def __init__(self):
 	def terminate(self):
 		self._bufSink._allowDelete = True
 
-	def speak(self,speechSequence):
+	def speak(self, speechSequence: SpeechSequence):
 		textList=[]
 		charMode=False
 		item=None
 		oldPitch = self.pitch
 		oldVolume = self.volume
 		oldRate = self.rate
-
+		prosodyInSequence = (type(i) for i in speechSequence if isinstance(i, BaseProsodyCommand))
+		if prosodyInSequence :
+			# #15500: Some SAPI4 voices reset all prosody when they receive any prosody command.
+			# Therefore, we add all default values to the start of the sequence.
+			prosodyToAdd = [
+				c() for c in self.supportedCommands
+				if issubclass(c, BaseProsodyCommand)
+				and c not in prosodyInSequence
+			]
+			speechSequence = prosodyToAdd + speechSequence
 		for item in speechSequence:
 			if isinstance(item,str):
 				textList.append(item.replace('\\','\\\\'))
