.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
     env:
       CARGO_TOKEN: ${{ secrets.CARGO_TOKEN }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - run: |
           sudo apt-get update
           sudo apt-get install -y libspeechd-dev

.github/workflows/test.yml

@@ -5,17 +5,6 @@ on:
   pull_request:
 
 jobs:
-  check_formatting:
-    name: Check Formatting
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - run: |
-          rustup toolchain install stable
-          cargo fmt --all --check
-          cd examples/web
-          cargo fmt --all --check
-
   check:
     name: Check
     strategy:
@@ -23,38 +12,41 @@ jobs:
         os: [windows-latest, ubuntu-22.04, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - run: sudo apt-get update; sudo apt-get install -y libspeechd-dev
         if: ${{ runner.os == 'Linux' }}
       - run: |
           rustup toolchain install stable
-          cargo clippy --all-targets
+          cargo fmt --check
+          cargo clippy
 
   check_web:
     name: Check Web
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - run: |
           rustup target add wasm32-unknown-unknown
           rustup toolchain install stable
-          cargo clippy --all-targets --target wasm32-unknown-unknown
+          cargo fmt --all --check
+          cargo clippy --target wasm32-unknown-unknown
 
   check_android:
     name: Check Android
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - run: |
-          rustup target add aarch64-linux-android
           rustup toolchain install stable
-          cargo clippy --all-targets --target aarch64-linux-android
+          rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
+          cargo install -f cargo-apk
+          cargo apk build
 
   check_web_example:
     name: Check Web Example
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - run: |
           rustup target add wasm32-unknown-unknown
           rustup toolchain install stable

Cargo.toml

@@ -1,10 +1,9 @@
 [package]
 name = "tts"
-version = "0.26.1"
+version = "0.25.5"
 authors = ["Nolan Darilek <nolan@thewordnerd.info>"]
 repository = "https://github.com/ndarilek/tts-rs"
 description = "High-level Text-To-Speech (TTS) interface"
-documentation = "https://docs.rs/tts"
 license = "MIT"
 exclude = ["*.cfg", "*.yml"]
 edition = "2021"
@@ -27,18 +26,11 @@ serde = { version = "1", optional = true, features = ["derive"] }
 thiserror = "1"
 
 [dev-dependencies]
-env_logger = "0.11"
+env_logger = "0.10"
 
 [target.'cfg(windows)'.dependencies]
 tolk = { version = "0.5", optional = true }
-windows = { version = "0.56", features = [
-    "Foundation",
-    "Foundation_Collections",
-    "Media_Core",
-    "Media_Playback",
-    "Media_SpeechSynthesis",
-    "Storage_Streams",
-] }
+windows = { version = "0.48", features = ["Foundation", "Foundation_Collections", "Media_Core", "Media_Playback", "Media_SpeechSynthesis", "Storage_Streams"] }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 speech-dispatcher = { version = "0.16", default-features = false }
@@ -51,21 +43,13 @@ objc = { version = "0.2", features = ["exception"] }
 
 [target.wasm32-unknown-unknown.dependencies]
 wasm-bindgen = "0.2"
-web-sys = { version = "0.3", features = [
-    "EventTarget",
-    "SpeechSynthesis",
-    "SpeechSynthesisErrorCode",
-    "SpeechSynthesisErrorEvent",
-    "SpeechSynthesisEvent",
-    "SpeechSynthesisUtterance",
-    "SpeechSynthesisVoice",
-    "Window",
-] }
+web-sys = { version = "0.3", features = ["EventTarget", "SpeechSynthesis", "SpeechSynthesisErrorCode", "SpeechSynthesisErrorEvent", "SpeechSynthesisEvent", "SpeechSynthesisUtterance", "SpeechSynthesisVoice", "Window", ] }
 
 [target.'cfg(target_os="android")'.dependencies]
 jni = "0.21"
 ndk-context = "0.1"
+ndk-glue = "0.7"
 
 [package.metadata.docs.rs]
 no-default-features = true
-features = ["speech_dispatcher_0_11"]
+features = ["speech_dispatcher_0_11"]

src/backends/speech_dispatcher.rs

@@ -188,7 +188,6 @@ impl Backend for SpeechDispatcher {
             .0
             .list_synthesis_voices()?
             .iter()
-            .filter(|v| LanguageTag::parse(v.language.clone()).is_ok())
             .map(|v| Voice {
                 id: v.name.clone(),
                 name: v.name.clone(),

src/lib.rs

@@ -14,10 +14,9 @@ use std::collections::HashMap;
 #[cfg(target_os = "macos")]
 use std::ffi::CStr;
 use std::fmt;
-use std::rc::Rc;
 #[cfg(windows)]
 use std::string::FromUtf16Error;
-use std::sync::Mutex;
+use std::sync::{Arc, Mutex};
 use std::{boxed::Box, sync::RwLock};
 
 #[cfg(any(target_os = "macos", target_os = "ios"))]
@@ -259,7 +258,7 @@ lazy_static! {
 }
 
 #[derive(Clone)]
-pub struct Tts(Rc<RwLock<Box<dyn Backend>>>);
+pub struct Tts(Arc<RwLock<Box<dyn Backend>>>);
 
 unsafe impl Send for Tts {}
 
@@ -272,18 +271,18 @@ impl Tts {
             #[cfg(target_os = "linux")]
             Backends::SpeechDispatcher => {
                 let tts = backends::SpeechDispatcher::new()?;
-                Ok(Tts(Rc::new(RwLock::new(Box::new(tts)))))
+                Ok(Tts(Arc::new(RwLock::new(Box::new(tts)))))
             }
             #[cfg(target_arch = "wasm32")]
             Backends::Web => {
                 let tts = backends::Web::new()?;
-                Ok(Tts(Rc::new(RwLock::new(Box::new(tts)))))
+                Ok(Tts(Arc::new(RwLock::new(Box::new(tts)))))
             }
             #[cfg(all(windows, feature = "tolk"))]
             Backends::Tolk => {
                 let tts = backends::Tolk::new();
                 if let Some(tts) = tts {
-                    Ok(Tts(Rc::new(RwLock::new(Box::new(tts)))))
+                    Ok(Tts(Arc::new(RwLock::new(Box::new(tts)))))
                 } else {
                     Err(Error::NoneError)
                 }
@@ -291,20 +290,20 @@ impl Tts {
             #[cfg(windows)]
             Backends::WinRt => {
                 let tts = backends::WinRt::new()?;
-                Ok(Tts(Rc::new(RwLock::new(Box::new(tts)))))
+                Ok(Tts(Arc::new(RwLock::new(Box::new(tts)))))
             }
             #[cfg(target_os = "macos")]
-            Backends::AppKit => Ok(Tts(Rc::new(RwLock::new(
-                Box::new(backends::AppKit::new()?),
-            )))),
+            Backends::AppKit => Ok(Tts(Arc::new(RwLock::new(Box::new(
+                backends::AppKit::new()?
+            ))))),
             #[cfg(any(target_os = "macos", target_os = "ios"))]
-            Backends::AvFoundation => Ok(Tts(Rc::new(RwLock::new(Box::new(
+            Backends::AvFoundation => Ok(Tts(Arc::new(RwLock::new(Box::new(
                 backends::AvFoundation::new()?,
             ))))),
             #[cfg(target_os = "android")]
             Backends::Android => {
                 let tts = backends::Android::new()?;
-                Ok(Tts(Rc::new(RwLock::new(Box::new(tts)))))
+                Ok(Tts(Arc::new(RwLock::new(Box::new(tts)))))
             }
         };
         if let Ok(backend) = backend {
@@ -572,7 +571,7 @@ impl Tts {
         if utterance_callbacks {
             let mut callbacks = CALLBACKS.lock().unwrap();
             let id = self.0.read().unwrap().id().unwrap();
-            let callbacks = callbacks.get_mut(&id).unwrap();
+            let mut callbacks = callbacks.get_mut(&id).unwrap();
             callbacks.utterance_begin = callback;
             Ok(())
         } else {
@@ -592,7 +591,7 @@ impl Tts {
         if utterance_callbacks {
             let mut callbacks = CALLBACKS.lock().unwrap();
             let id = self.0.read().unwrap().id().unwrap();
-            let callbacks = callbacks.get_mut(&id).unwrap();
+            let mut callbacks = callbacks.get_mut(&id).unwrap();
             callbacks.utterance_end = callback;
             Ok(())
         } else {
@@ -612,7 +611,7 @@ impl Tts {
         if utterance_callbacks {
             let mut callbacks = CALLBACKS.lock().unwrap();
             let id = self.0.read().unwrap().id().unwrap();
-            let callbacks = callbacks.get_mut(&id).unwrap();
+            let mut callbacks = callbacks.get_mut(&id).unwrap();
             callbacks.utterance_stop = callback;
             Ok(())
         } else {
@@ -641,7 +640,7 @@ impl Tts {
 
 impl Drop for Tts {
     fn drop(&mut self) {
-        if Rc::strong_count(&self.0) <= 1 {
+        if Arc::strong_count(&self.0) <= 1 {
             if let Some(id) = self.0.read().unwrap().id() {
                 let mut callbacks = CALLBACKS.lock().unwrap();
                 callbacks.remove(&id);