Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Windows tts backend: dont turn pages if read aloud is trigerred while already speaking

Browse Source
This commit is contained in:
Kovid Goyal 2020-12-11 08:03:18 +05:30
parent f444e0d56f
commit 10f922f0e1
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/tts/windows.py
View File

@ -3,6 +3,7 @@
# License: GPL v3 Copyright: 2020, Kovid Goyal <kovid at kovidgoyal.net> # License: GPL v3 Copyright: 2020, Kovid Goyal <kovid at kovidgoyal.net>
from time import monotonic
from threading import Thread from threading import Thread
from calibre import prepare_string_for_xml from calibre import prepare_string_for_xml
@ -23,7 +24,8 @@ class Client:
def __init__(self, settings=None, dispatch_on_main_thread=lambda f: f()): def __init__(self, settings=None, dispatch_on_main_thread=lambda f: f()):
self.create_voice() self.create_voice()
self.ignore_next_stop_event = self.ignore_next_start_event = False self.ignore_next_stop_event = None
self.ignore_next_start_event = False
self.default_system_rate = self.sp_voice.get_current_rate() self.default_system_rate = self.sp_voice.get_current_rate()
self.default_system_voice = self.sp_voice.get_current_voice() self.default_system_voice = self.sp_voice.get_current_voice()
self.default_system_sound_output = self.sp_voice.get_current_sound_output() self.default_system_sound_output = self.sp_voice.get_current_sound_output()
@ -51,7 +53,7 @@ class Client:
def apply_settings(self, new_settings=None): def apply_settings(self, new_settings=None):
if self.status['paused']: if self.status['paused']:
self.sp_voice.resume() self.sp_voice.resume()
self.ignore_next_stop_event = True self.ignore_next_stop_event = monotonic()
self.status = {'synthesizing': False, 'paused': False} self.status = {'synthesizing': False, 'paused': False}
if new_settings is not None: if new_settings is not None:
self.settings = new_settings self.settings = new_settings
@ -81,8 +83,8 @@ class Client:
event = Event(EventType.begin) event = Event(EventType.begin)
self.status = {'synthesizing': True, 'paused': False} self.status = {'synthesizing': True, 'paused': False}
elif event_type == SPEI_END_INPUT_STREAM: elif event_type == SPEI_END_INPUT_STREAM:
if self.ignore_next_stop_event: if self.ignore_next_stop_event is not None and monotonic() - self.ignore_next_stop_event < 2:
self.ignore_next_stop_event = False self.ignore_next_stop_event = None
continue continue
event = Event(EventType.end) event = Event(EventType.end)
self.status = {'synthesizing': False, 'paused': False} self.status = {'synthesizing': False, 'paused': False}
@ -111,6 +113,8 @@ class Client:
def speak_marked_text(self, text, callback): def speak_marked_text(self, text, callback):
self.current_marked_text = text self.current_marked_text = text
self.last_mark = None self.last_mark = None
if self.status['synthesizing']:
self.ignore_next_stop_event = monotonic()
self.current_callback = callback self.current_callback = callback
self.speak(text, is_xml=True) self.speak(text, is_xml=True)