nolan/tts-rs
1
0
Fork 0
mirror of https://github.com/ndarilek/tts-rs.git synced 2024-11-17 09:09:38 +00:00
Code Issues Projects Releases Wiki Activity

Switch to using MediaPlaybackItem as WinRT utterance ID.

Browse Source
This commit is contained in:
Nolan Darilek 2020-09-22 14:51:59 -05:00
parent 4816ec575c
commit f5f11b7cdf
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backends/winrt.rs
View File

@ -1,7 +1,4 @@
#[cfg(windows)]
use std::sync::Mutex;
use lazy_static::lazy_static;
use log::{info, trace};
use tts_winrt_bindings::windows::media::core::MediaSource;
@ -24,10 +21,6 @@ pub struct WinRT {
playback_list: MediaPlaybackList,
}
lazy_static! {
static ref NEXT_UTTERANCE_ID: Mutex<u64> = Mutex::new(0);
}
impl WinRT {
pub fn new() -> std::result::Result<Self, Error> {
info!("Initializing WinRT backend");
@ -83,13 +76,11 @@ impl Backend for WinRT {
self.reinit_player()?;
}
}
self.playback_list.items()?.append(item)?;
self.playback_list.items()?.append(&item)?;
if !self.is_speaking()? {
self.player.play()?;
}
let mut utterance_id = NEXT_UTTERANCE_ID.lock().unwrap();
*utterance_id += 1;
Ok(Some(UtteranceId::WinRT(*utterance_id)))
Ok(Some(UtteranceId::WinRT(item)))
}
fn stop(&mut self) -> std::result::Result<(), Error> {

7
src/lib.rs
View File

@ -23,6 +23,9 @@ use libc::c_char;
use objc::{class, msg_send, sel, sel_impl};
use thiserror::Error;
#[cfg(windows)]
use tts_winrt_bindings::windows::media::playback::MediaPlaybackItem;
mod backends;
pub enum Backends {
@ -40,14 +43,14 @@ pub enum Backends {
AvFoundation,
}
#[derive(Clone, Copy, Debug, PartialEq)]
#[derive(Clone, Debug, PartialEq)]
pub enum UtteranceId {
#[cfg(target_os = "linux")]
SpeechDispatcher(i32),
#[cfg(target_arch = "wasm32")]
Web(u64),
#[cfg(windows)]
WinRT(u64),
WinRT(MediaPlaybackItem),
}
pub struct Features {