diff --git a/Cargo.toml b/Cargo.toml index 361d164..37edeb7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tts" -version = "0.22.4" +version = "0.23.0" authors = ["Nolan Darilek "] repository = "https://github.com/ndarilek/tts-rs" description = "High-level Text-To-Speech (TTS) interface" @@ -28,7 +28,7 @@ env_logger = "0.9" [target.'cfg(windows)'.dependencies] tolk = { version = "0.5", optional = true } -windows = { version = "0.38", features = ["alloc", "Foundation", "Foundation_Collections", "Media_Core", "Media_Playback", "Media_SpeechSynthesis", "Storage_Streams"] } +windows = { version = "0.39", features = ["Foundation", "Foundation_Collections", "Media_Core", "Media_Playback", "Media_SpeechSynthesis", "Storage_Streams"] } [target.'cfg(target_os = "linux")'.dependencies] speech-dispatcher = { version = "0.13", default-features = false } diff --git a/src/backends/winrt.rs b/src/backends/winrt.rs index 6a0437f..901cda6 100644 --- a/src/backends/winrt.rs +++ b/src/backends/winrt.rs @@ -86,7 +86,7 @@ impl WinRt { backend_to_speech_synthesizer.insert(bid, synth.clone()); drop(backend_to_speech_synthesizer); let bid_clone = bid; - player.MediaEnded(TypedEventHandler::new( + player.MediaEnded(&TypedEventHandler::new( move |sender: &Option, _args| { if let Some(sender) = sender { let backend_to_media_player = BACKEND_TO_MEDIA_PLAYER.lock().unwrap(); @@ -110,14 +110,14 @@ impl WinRt { tts.Options()?.SetSpeakingRate(utterance.rate.into())?; tts.Options()?.SetAudioPitch(utterance.pitch.into())?; tts.Options()?.SetAudioVolume(utterance.volume.into())?; - tts.SetVoice(utterance.voice.clone())?; - let stream = tts - .SynthesizeTextToStreamAsync(utterance.text.as_str())? - .get()?; + tts.SetVoice(&utterance.voice)?; + let text = &utterance.text; + let stream = + tts.SynthesizeTextToStreamAsync(&text.into())?.get()?; let content_type = stream.ContentType()?; let source = - MediaSource::CreateFromStream(stream, content_type)?; - sender.SetSource(source)?; + MediaSource::CreateFromStream(&stream, &content_type)?; + sender.SetSource(&source)?; sender.Play()?; if let Some(callback) = callbacks.utterance_begin.as_mut() { callback(utterance.id); @@ -147,6 +147,7 @@ impl WinRt { self.synth.Options()?.SetAudioPitch(self.pitch.into())?; self.synth.Options()?.SetAudioVolume(self.volume.into())?; + self.synth.SetVoice(&self.voice)?; let synth_stream = self.synth.SynthesizeTextToStreamAsync(text)?.get()?; let size = synth_stream.Size()?; @@ -347,7 +348,7 @@ impl Backend for WinRt { for v in SpeechSynthesizer::AllVoices()? { let vid: String = v.Id()?.try_into()?; if vid == voice.id { - self.voice = v.clone(); + self.voice = v; return Ok(()); } } diff --git a/src/lib.rs b/src/lib.rs index 98b723e..96fdc6a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -650,13 +650,13 @@ impl Drop for Tts { } } -#[derive(Clone, Copy, Debug)] +#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] pub enum Gender { Male, Female, } -#[derive(Clone, Debug)] +#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] pub struct Voice { pub(crate) id: String, pub(crate) name: String,