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

Get basic speaking working again

Browse Source
This commit is contained in:
Kovid Goyal 2023-01-24 14:12:51 +05:30
parent c6ec13ae7e
commit 7b47a70493
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,13 @@ using namespace winrt::Windows::Media::Core;
using namespace winrt::Windows::Storage::Streams;
typedef unsigned long long id_type;
#define debug(format_string, ...) { \
std::scoped_lock _sl_(output_lock); \
DWORD _tid_ = GetCurrentThreadId(); \
char _buf_[64] = {0}; snprintf(_buf_, sizeof(_buf_)-1, "thread-%u", _tid_); \
fprintf(stderr, "%s " format_string "\n", main_thread_id == _tid_ ? "thread-main" : _buf_, __VA_ARGS__); fflush(stderr);\
}
static std::mutex output_lock;
static std::atomic_bool main_loop_is_running;
static DWORD main_thread_id;
@ -119,7 +126,7 @@ serialize_string_for_json(std::string const &src) {
return ans;
}
class json_val {
class json_val { // {{{
private:
enum { DT_INT, DT_STRING, DT_LIST, DT_OBJECT, DT_NONE, DT_BOOL } type;
std::string s;
@ -208,7 +215,7 @@ public:
}
return "";
}
};
}; // }}}
static void
output(id_type cmd_id, std::string_view const &msg_type, json_val const &&msg) {
@ -672,9 +679,9 @@ class Synthesizer {
}
public:
bool cmd_id_is_current(id_type cmd_id) const noexcept { return current_cmd_id.load() == cmd_id; }
void output(id_type cmd_id, std::string_view const& type, json_val const& x) {
void output(id_type cmd_id, std::string_view const& type, json_val const && x) {
std::scoped_lock sl(recursive_lock);
if (cmd_id_is_current(cmd_id)) output(cmd_id, type, x);
if (cmd_id_is_current(cmd_id)) ::output(cmd_id, type, std::move(x));
}
void initialize() {
synth = SpeechSynthesizer();

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

@ -2,10 +2,37 @@
# License: GPLv3 Copyright: 2023, Kovid Goyal <kovid at kovidgoyal.net>
import calibre_extensions.winspeech as winspeech
import sys
import time
from contextlib import closing
from threading import Thread
winspeech
from calibre.utils.ipc.simple_worker import start_pipe_worker
def develop():
pass
def develop_speech(text='Lucca brazzi sleeps with the fishes'):
p = start_pipe_worker('from calibre_extensions.winspeech import run_main_loop; run_main_loop()')
print('\x1b[32mSpeaking', text, '\x1b[39m', flush=True)
def echo_output(p):
for line in p.stdout:
sys.stdout.buffer.write(b'\x1b[33m' + line + b'\x1b[39m')
sys.stdout.buffer.flush()
def send(*a):
cmd = ' '.join(map(str, a)) + '\n'
p.stdin.write(cmd.encode())
p.stdin.flush()
Thread(name='Echo', target=echo_output, args=(p,), daemon=True).start()
with closing(p.stdin), closing(p.stdout):
try:
send('1 echo Synthesizer started')
send('2 speak text inline', text)
time.sleep(6)
send('3 echo Synthesizer exiting')
send('exit')
time.sleep(1)
finally:
if p.poll() is None:
p.kill()