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

Nicer Read Aloud error message on windows systems without windows media pack

Browse Source
This commit is contained in:
Kovid Goyal 2023-02-15 08:55:00 +05:30
parent 94a5ee6043
commit 04cfa38056
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/utils/windows/winspeech.cpp
View File

@ -838,6 +838,8 @@ handle_stdin_message(winrt::hstring const &&msg) {
return exit_code; return exit_code;
} }
#define INITIALIZE_FAILURE_MESSAGE "Failed to initialize SpeechSynthesizer and MediaPlayer"
static PyObject* static PyObject*
run_main_loop(PyObject*, PyObject*) { run_main_loop(PyObject*, PyObject*) {
if (!run_catching_exceptions([]() { if (!run_catching_exceptions([]() {
@ -864,7 +866,7 @@ run_main_loop(PyObject*, PyObject*) {
media_player = MediaPlayer(); media_player = MediaPlayer();
media_player.AudioCategory(MediaPlayerAudioCategory::Speech); media_player.AudioCategory(MediaPlayerAudioCategory::Speech);
media_player.AutoPlay(true); media_player.AutoPlay(true);
}, "Failed to initialize SpeechSynthesizer and MediaPlayer", __LINE__)) { }, INITIALIZE_FAILURE_MESSAGE, __LINE__)) {
return PyLong_FromLongLong(1); return PyLong_FromLongLong(1);
} }
@ -916,6 +918,7 @@ static PyMethodDef methods[] = {
static int static int
exec_module(PyObject *m) { exec_module(PyObject *m) {
PyModule_AddStringMacro(m, INITIALIZE_FAILURE_MESSAGE);
return 0; return 0;
} }

14
src/calibre/utils/windows/winspeech.py
View File

@ -107,11 +107,22 @@ class SpeechError(OSError):
class NoAudioDevices(OSError): class NoAudioDevices(OSError):
display_to_user = True
def __init__(self): def __init__(self):
super().__init__(_('No active audio output devices found.' super().__init__(_('No active audio output devices found.'
' Connect headphones or speakers. If you are using Remote Desktop then enable Remote Audio for it.')) ' Connect headphones or speakers. If you are using Remote Desktop then enable Remote Audio for it.'))
class NoMediaPack(OSError):
display_to_user = True
def __init__(self):
super().__init__(_('This computer is missing the Windows MediaPack, which is needed for Read aloud. Instructions'
' for installing it are available at {}').format(
'https://support.medal.tv/support/solutions/articles/48001157311-windows-is-missing-media-pack'))
class Error(NamedTuple): class Error(NamedTuple):
msg: str msg: str
error: str = '' error: str = ''
@ -121,8 +132,11 @@ class Error(NamedTuple):
related_to: int = 0 related_to: int = 0
def as_exception(self, msg='', check_for_no_audio_devices=False): def as_exception(self, msg='', check_for_no_audio_devices=False):
from calibre_extensions.winspeech import INITIALIZE_FAILURE_MESSAGE
if check_for_no_audio_devices and self.hr == 0xc00d36fa: if check_for_no_audio_devices and self.hr == 0xc00d36fa:
return NoAudioDevices() return NoAudioDevices()
if check_for_no_audio_devices and self.hr == 0x80070002 and self.msg == INITIALIZE_FAILURE_MESSAGE:
return NoMediaPack()
return SpeechError(self, msg) return SpeechError(self, msg)