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

Implement FnMut callbacks on AV Foundation, and fix warnings.

This commit is contained in:
Nolan Darilek 2020-09-25 11:12:44 -05:00
parent 1f22843086
commit 589c613bbe
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backends/av_foundation.rs
View File

@ -33,15 +33,15 @@ impl AvFoundation {
extern "C" fn speech_synthesizer_did_start_speech_utterance( extern "C" fn speech_synthesizer_did_start_speech_utterance(
this: &Object, this: &Object,
_: Sel, _: Sel,
synth: *const Object, _synth: *const Object,
utterance: id, utterance: id,
) { ) {
unsafe { unsafe {
let backend_id: u64 = *this.get_ivar("backend_id"); let backend_id: u64 = *this.get_ivar("backend_id");
let backend_id = BackendId::AvFoundation(backend_id); let backend_id = BackendId::AvFoundation(backend_id);
let callbacks = CALLBACKS.lock().unwrap(); let mut callbacks = CALLBACKS.lock().unwrap();
let callbacks = callbacks.get(&backend_id).unwrap(); let callbacks = callbacks.get_mut(&backend_id).unwrap();
if let Some(callback) = callbacks.utterance_begin { if let Some(callback) = callbacks.utterance_begin.as_mut() {
let utterance_id = UtteranceId::AvFoundation(utterance); let utterance_id = UtteranceId::AvFoundation(utterance);
callback(utterance_id); callback(utterance_id);
} }
@ -51,15 +51,15 @@ impl AvFoundation {
extern "C" fn speech_synthesizer_did_finish_speech_utterance( extern "C" fn speech_synthesizer_did_finish_speech_utterance(
this: &Object, this: &Object,
_: Sel, _: Sel,
synth: *const Object, _synth: *const Object,
utterance: id, utterance: id,
) { ) {
unsafe { unsafe {
let backend_id: u64 = *this.get_ivar("backend_id"); let backend_id: u64 = *this.get_ivar("backend_id");
let backend_id = BackendId::AvFoundation(backend_id); let backend_id = BackendId::AvFoundation(backend_id);
let callbacks = CALLBACKS.lock().unwrap(); let mut callbacks = CALLBACKS.lock().unwrap();
let callbacks = callbacks.get(&backend_id).unwrap(); let callbacks = callbacks.get_mut(&backend_id).unwrap();
if let Some(callback) = callbacks.utterance_end { if let Some(callback) = callbacks.utterance_end.as_mut() {
let utterance_id = UtteranceId::AvFoundation(utterance); let utterance_id = UtteranceId::AvFoundation(utterance);
callback(utterance_id); callback(utterance_id);
} }