Skip to content

Pr7599 review actions #9626

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

Merged
michaelDCurran merged 11 commits into from
May 28, 2019
Merged

Pr7599 review actions #9626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7267101
SayAll: avoid error when reading to the end of a Microsoft word docum…
michaelDCurran May 27, 2019
3e2ae56
Move speech.py into its own package ready for splitting out into sepa…
michaelDCurran May 27, 2019
ab882b4
Move speech command objects into a speech.commands module.
michaelDCurran May 27, 2019
7a252d4
Split out speechManager into speech.manager module and priority const…
michaelDCurran May 28, 2019
833d5c6
espeak: provide constants for callback return codes.
michaelDCurran May 28, 2019
ba18321
espeak: use named constants for converting ms to bytes.
michaelDCurran May 28, 2019
b870544
nvWave: use named constants for buffer size calculation.
michaelDCurran May 28, 2019
0c4ed0d
speech.getSpeechForSpelling: use a named constant for the idiographic…
michaelDCurran May 28, 2019
ddebb1d
espeak: ensure that onIndexReached is set before espeak_setSynthCallb…
michaelDCurran May 28, 2019
88764e9
removed accidental file speech./commands.py
feerrenrut May 28, 2019
3a15df0
rename constant with caps
feerrenrut May 28, 2019
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
4 changes: 3 additions & 1 deletion source/nvwave.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@ def __init__(self, channels, samplesPerSec, bitsPerSample,
if buffered:
#: Minimum size of the buffer before audio is played.
#: However, this is ignored if an C{onDone} callback is provided to L{feed}.
self._minBufferSize = samplesPerSec * channels * (bitsPerSample / 8) / 1000 * self.MIN_BUFFER_MS
BITS_PER_BYTE = 8
MS_PER_SEC = 1000
self._minBufferSize = samplesPerSec * channels * (bitsPerSample / BITS_PER_BYTE) / MS_PER_SEC * self.MIN_BUFFER_MS
self._buffer = ""
else:
self._minBufferSize = None
Expand Down
6 changes: 3 additions & 3 deletions source/sayAllHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def nextLine(self):
return
# Call lineReached when we start speaking this line.
# lineReached will move the cursor and trigger reading of the next line.
cb = speech.CallbackCommand(lambda: self.lineReached(bookmark, self.speakTextInfoState.copy()))
cb = speech.CallbackCommand(lambda obj=self.reader.obj, state=self.speakTextInfoState.copy(): self.lineReached(obj,bookmark, state))
spoke = speech.speakTextInfo(self.reader, unit=textInfos.UNIT_READINGCHUNK,
reason=controlTypes.REASON_SAYALL, _prefixSpeechCommand=cb,
useCache=self.speakTextInfoState)
Expand All @@ -168,10 +168,10 @@ def nextLine(self):
# The first buffered line has now started speaking.
self.numBufferedLines -= 1

def lineReached(self, bookmark, state):
def lineReached(self, obj, bookmark, state):
# We've just started speaking this line, so move the cursor there.
state.updateObj()
updater = self.reader.obj.makeTextInfo(bookmark)
updater = obj.makeTextInfo(bookmark)
if self.cursor == CURSOR_CARET:
updater.updateCaret()
if self.cursor != CURSOR_CARET or config.conf["reviewCursor"]["followCaret"]:
Expand Down
Loading