nolan
/
tts-rs
mirror of https://github.com/ndarilek/tts-rs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Pass TTS instance as first argument to utterance callbacks." 

This appears to break callbacks, and is of limited utility.

This reverts commit 29c0a8463e.
This commit is contained in:
Nolan Darilek 2020-11-03 11:03:55 -06:00
parent 5a9c96508f
commit d3e05b5a7a
6 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/hello_world.rs
View File

@ -17,13 +17,13 @@ fn main() -> Result<(), Error> {
..
} = tts.supported_features();
if utterance_callbacks {
tts.on_utterance_begin(Some(Box::new(|_tts, utterance| {
tts.on_utterance_begin(Some(Box::new(|utterance| {
println!("Started speaking {:?}", utterance)
})))?;
tts.on_utterance_end(Some(Box::new(|_tts, utterance| {
tts.on_utterance_end(Some(Box::new(|utterance| {
println!("Finished speaking {:?}", utterance)
})))?;
tts.on_utterance_stop(Some(Box::new(|_tts, utterance| {
tts.on_utterance_stop(Some(Box::new(|utterance| {
println!("Stopped speaking {:?}", utterance)
})))?;
}

6
src/backends/av_foundation.rs
View File

@ -44,7 +44,7 @@ impl AvFoundation {
let callbacks = callbacks.get_mut(&backend_id).unwrap();
if let Some(callback) = callbacks.utterance_begin.as_mut() {
let utterance_id = UtteranceId::AvFoundation(utterance);
callback(callbacks.tts.clone(), utterance_id);
callback(utterance_id);
}
}
}
@ -62,7 +62,7 @@ impl AvFoundation {
let callbacks = callbacks.get_mut(&backend_id).unwrap();
if let Some(callback) = callbacks.utterance_end.as_mut() {
let utterance_id = UtteranceId::AvFoundation(utterance);
callback(callbacks.tts.clone(), utterance_id);
callback(utterance_id);
}
}
}
@ -80,7 +80,7 @@ impl AvFoundation {
let callbacks = callbacks.get_mut(&backend_id).unwrap();
if let Some(callback) = callbacks.utterance_stop.as_mut() {
let utterance_id = UtteranceId::AvFoundation(utterance);
callback(callbacks.tts.clone(), utterance_id);
callback(utterance_id);
}
}
}

6
src/backends/speech_dispatcher.rs
View File

@ -33,7 +33,7 @@ impl SpeechDispatcher {
let cb = callbacks.get_mut(&backend_id).unwrap();
let utterance_id = UtteranceId::SpeechDispatcher(msg_id);
if let Some(f) = cb.utterance_begin.as_mut() {
f(cb.tts.clone(), utterance_id);
f(utterance_id);
}
})));
sd.0.on_end(Some(Box::new(|msg_id, client_id| {
@ -44,7 +44,7 @@ impl SpeechDispatcher {
let cb = callbacks.get_mut(&backend_id).unwrap();
let utterance_id = UtteranceId::SpeechDispatcher(msg_id);
if let Some(f) = cb.utterance_end.as_mut() {
f(cb.tts.clone(), utterance_id);
f(utterance_id);
}
})));
sd.0.on_cancel(Some(Box::new(|msg_id, client_id| {
@ -55,7 +55,7 @@ impl SpeechDispatcher {
let cb = callbacks.get_mut(&backend_id).unwrap();
let utterance_id = UtteranceId::SpeechDispatcher(msg_id);
if let Some(f) = cb.utterance_stop.as_mut() {
f(cb.tts.clone(), utterance_id);
f(utterance_id);
}
})));
sd.0.on_pause(Some(Box::new(|_msg_id, client_id| {

6
src/backends/web.rs
View File

@ -75,7 +75,7 @@ impl Backend for Web {
let mut callbacks = CALLBACKS.lock().unwrap();
let callback = callbacks.get_mut(&id).unwrap();
if let Some(f) = callback.utterance_begin.as_mut() {
f(callback.tts.clone(), utterance_id);
f(utterance_id);
}
}) as Box<dyn Fn(_)>);
utterance.set_onstart(Some(callback.as_ref().unchecked_ref()));
@ -83,7 +83,7 @@ impl Backend for Web {
let mut callbacks = CALLBACKS.lock().unwrap();
let callback = callbacks.get_mut(&id).unwrap();
if let Some(f) = callback.utterance_end.as_mut() {
f(callback.tts.clone(), utterance_id);
f(utterance_id);
}
let mut mappings = UTTERANCE_MAPPINGS.lock().unwrap();
mappings.retain(|v| v.1 != utterance_id);
@ -94,7 +94,7 @@ impl Backend for Web {
let mut callbacks = CALLBACKS.lock().unwrap();
let callback = callbacks.get_mut(&id).unwrap();
if let Some(f) = callback.utterance_stop.as_mut() {
f(callback.tts.clone(), utterance_id);
f(utterance_id);
}
}
let mut mappings = UTTERANCE_MAPPINGS.lock().unwrap();

8
src/backends/winrt.rs
View File

@ -79,7 +79,7 @@ impl WinRT {
let callbacks = callbacks.get_mut(&self.id).unwrap();
if let Some(callback) = callbacks.utterance_stop.as_mut() {
for mapping in &*mappings {
callback(callbacks.tts.clone(), mapping.2);
callback(mapping.2);
}
}
mappings.retain(|v| v.0 != self.id);
@ -101,7 +101,7 @@ impl WinRT {
if let Some(callback) = callbacks.utterance_end.as_mut() {
let last_spoken_utterance = LAST_SPOKEN_UTTERANCE.lock().unwrap();
if let Some(utterance_id) = last_spoken_utterance.get(&id) {
callback(callbacks.tts.clone(), utterance_id.clone());
callback(utterance_id.clone());
}
}
}
@ -124,7 +124,7 @@ impl WinRT {
if let Some(callback) = callbacks.utterance_end.as_mut() {
for mapping in &*mappings {
if mapping.1 == old_item {
callback(callbacks.tts.clone(), mapping.2);
callback(mapping.2);
}
}
mappings.retain(|v| v.1 != old_item);
@ -142,7 +142,7 @@ impl WinRT {
if let Some(callback) = callbacks.utterance_begin.as_mut() {
for mapping in &*mappings {
if mapping.1 == new_item {
callback(callbacks.tts.clone(), mapping.2);
callback(mapping.2);
}
}
}

22
src/lib.rs
View File

@ -133,11 +133,11 @@ trait Backend: Clone + std::fmt::Debug {
fn is_speaking(&self) -> Result<bool, Error>;
}
#[derive(Default)]
struct Callbacks {
tts: TTS,
utterance_begin: Option<Box<dyn FnMut(TTS, UtteranceId)>>,
utterance_end: Option<Box<dyn FnMut(TTS, UtteranceId)>>,
utterance_stop: Option<Box<dyn FnMut(TTS, UtteranceId)>>,
utterance_begin: Option<Box<dyn FnMut(UtteranceId)>>,
utterance_end: Option<Box<dyn FnMut(UtteranceId)>>,
utterance_stop: Option<Box<dyn FnMut(UtteranceId)>>,
}
unsafe impl Send for Callbacks {}
@ -193,13 +193,7 @@ impl TTS {
if let Ok(backend) = backend {
if let Some(id) = backend.0.id() {
let mut callbacks = CALLBACKS.lock().unwrap();
let cb = Callbacks {
tts: backend.clone(),
utterance_begin: None,
utterance_end: None,
utterance_stop: None,
};
callbacks.insert(id, cb);
callbacks.insert(id, Callbacks::default());
}
Ok(backend)
} else {
@ -449,7 +443,7 @@ impl TTS {
*/
pub fn on_utterance_begin(
&self,
callback: Option<Box<dyn FnMut(TTS, UtteranceId)>>,
callback: Option<Box<dyn FnMut(UtteranceId)>>,
) -> Result<(), Error> {
let Features {
utterance_callbacks,
@ -471,7 +465,7 @@ impl TTS {
*/
pub fn on_utterance_end(
&self,
callback: Option<Box<dyn FnMut(TTS, UtteranceId)>>,
callback: Option<Box<dyn FnMut(UtteranceId)>>,
) -> Result<(), Error> {
let Features {
utterance_callbacks,
@ -493,7 +487,7 @@ impl TTS {
*/
pub fn on_utterance_stop(
&self,
callback: Option<Box<dyn FnMut(TTS, UtteranceId)>>,
callback: Option<Box<dyn FnMut(UtteranceId)>>,
) -> Result<(), Error> {
let Features {
utterance_callbacks,