Add utterance_begin and utterance_end signals.

Unfortunately, I can't figure out how to pass the utterance ID to these signals because I don't see that the GDNative Rust bindings support objects of one type creating objects of another (I.e. nodes creating references.) If I'm wrong, PRs or suggestions welcome.
This commit is contained in:
Nolan Darilek 2020-09-29 10:44:52 -05:00
parent cb7eda45e2
commit 795cc4790c
2 changed files with 46 additions and 7 deletions

View File

@ -9,8 +9,8 @@ crate-type = ["staticlib", "cdylib"]
[dependencies] [dependencies]
env_logger = "0.7" env_logger = "0.7"
gdnative = "0.9.0-preview.0" gdnative = "0.9"
tts = ">= 0.6.4" tts = "0.8"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
tolk = ">= 0.2.1" tolk = ">= 0.2.1"

View File

@ -1,19 +1,36 @@
use std::sync::mpsc::{channel, Receiver};
use gdnative::prelude::*; use gdnative::prelude::*;
use tts::{Features, TTS as Tts}; use tts::{Features, UtteranceId, TTS as Tts};
enum Msg {
UtteranceBegin(UtteranceId),
UtteranceEnd(UtteranceId),
}
#[derive(NativeClass)] #[derive(NativeClass)]
#[inherit(Node)] #[inherit(Node)]
#[register_with(Self::register_properties)] #[register_with(Self::register)]
struct TTS(Tts); struct TTS(Tts, Receiver<Msg>);
#[methods] #[methods]
impl TTS { impl TTS {
fn new(_owner: &Node) -> Self { fn new(_owner: &Node) -> Self {
let tts = Tts::default().unwrap(); let tts = Tts::default().unwrap();
Self(tts) let (tx, rx) = channel();
let tx_end = tx.clone();
tts.on_utterance_begin(Some(Box::new(move |utterance| {
tx.send(Msg::UtteranceBegin(utterance)).unwrap();
})))
.expect("Failed to set utterance_begin callback");
tts.on_utterance_end(Some(Box::new(move |utterance| {
tx_end.send(Msg::UtteranceEnd(utterance)).unwrap();
})))
.expect("Failed to set utterance_end callback");
Self(tts, rx)
} }
fn register_properties(builder: &ClassBuilder<Self>) { fn register(builder: &ClassBuilder<Self>) {
builder builder
.add_property("rate") .add_property("rate")
.with_getter(|this: &TTS, _| match this.0.get_rate() { .with_getter(|this: &TTS, _| match this.0.get_rate() {
@ -118,6 +135,14 @@ impl TTS {
} }
}) })
.done(); .done();
builder.add_signal(Signal {
name: "utterance_begin",
args: &[],
});
builder.add_signal(Signal {
name: "utterance_end",
args: &[],
});
} }
#[export] #[export]
@ -139,6 +164,20 @@ impl TTS {
} = self.0.supported_features(); } = self.0.supported_features();
rate_supported rate_supported
} }
#[export]
fn _process(&mut self, owner: &Node, _delta: f32) {
if let Some(msg) = self.1.try_recv().ok() {
match msg {
Msg::UtteranceBegin(_utterance) => {
owner.emit_signal("utterance_begin", &[]);
}
Msg::UtteranceEnd(_utterance) => {
owner.emit_signal("utterance_end", &[]);
}
}
}
}
} }
fn init(handle: InitHandle) { fn init(handle: InitHandle) {