Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make continuous reading work when using SAPI5 voices without bookmark support #17523

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Make continuous reading work when using SAPI5 voices without bookmark support #17523

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c2aedf
Make continuous reading work when using SAPI5 voices without bookmark…
gexgd0419 Dec 14, 2024
b4d8f04
Merge branch 'nvaccess:master' into fix-sapi5-continuous-reading
gexgd0419 Dec 16, 2024
dbd087c
Add changelog entry
gexgd0419 Dec 16, 2024
d963096
Fix
gexgd0419 Dec 16, 2024
d38197b
Fix SAPI4 continuous reading
gexgd0419 Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions source/synthDrivers/sapi5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from typing import Optional
from enum import IntEnum
import locale
from collections import OrderedDict
from collections import OrderedDict, deque
import comtypes.client
from comtypes import COMError
import winreg
Expand Down Expand Up @@ -77,12 +77,23 @@ def Bookmark(self, streamNum, pos, bookmark, bookmarkId):
log.debugWarning("Called Bookmark method on SapiSink while driver is dead")
return
synthIndexReached.notify(synth=synth, index=bookmarkId)
# remove already triggered bookmarks
if streamNum in synth._streamBookmarks:
bookmarks = synth._streamBookmarks[streamNum]
while bookmarks:
if bookmarks.popleft() == bookmarkId:
break

def EndStream(self, streamNum, pos):
synth = self.synthRef()
if synth is None:
log.debugWarning("Called Bookmark method on EndStream while driver is dead")
return
# trigger all untriggered bookmarks
if streamNum in synth._streamBookmarks:
for bookmark in synth._streamBookmarks[streamNum]:
synthIndexReached.notify(synth=synth, index=bookmark)
del synth._streamBookmarks[streamNum]
synthDoneSpeaking.notify(synth=synth)
if synth._audioDucker:
if audioDucking._isDebug():
Expand Down Expand Up @@ -137,6 +148,7 @@ def __init__(self, _defaultVoiceToken=None):
self._audioDucker = audioDucking.AudioDucker()
self._pitch = 50
self._initTts(_defaultVoiceToken)
self._streamBookmarks = dict() # key = stream num, value = deque of bookmarks

def terminate(self):
self._eventsConnection = None
Expand Down Expand Up @@ -263,6 +275,7 @@ def _convertPhoneme(self, ipa):

def speak(self, speechSequence):
textList = []
bookmarks = deque()

# NVDA SpeechCommands are linear, but XML is hierarchical.
# Therefore, we track values for non-empty tags.
Expand Down Expand Up @@ -298,6 +311,7 @@ def outputTags():
textList.append(item.replace("<", "&lt;"))
elif isinstance(item, IndexCommand):
textList.append('<Bookmark Mark="%d" />' % item.index)
bookmarks.append(item.index)
elif isinstance(item, CharacterModeCommand):
if item.state:
tags["spell"] = {}
Expand Down Expand Up @@ -397,7 +411,8 @@ def outputTags():
log.debug("Enabling audio ducking due to speak call")
tempAudioDucker.enable()
try:
self.tts.Speak(text, flags)
streamNum = self.tts.Speak(text, flags)
self._streamBookmarks[streamNum] = bookmarks
finally:
if tempAudioDucker:
if audioDucking._isDebug():
Expand Down