fix CI: cfg-gate avsynth/sapi by OS, replace w"" with HSTRING::from, fix clippy, update workflows for per-OS builds

willwade · willwade · commit 3f55c13b1385 · 2026-06-08T07:44:10.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,20 +20,54 @@ jobs:
       - name: Check formatting
         run: cargo fmt --all -- --check
 
-      - name: Clippy (all features)
-        run: cargo clippy --all-features -- -D warnings
+      - name: Clippy (Linux features)
+        run: cargo clippy --no-default-features --features system,cloud,sherpaonnx -- -D warnings
 
-      - name: Build (all features)
-        run: cargo build --all-features
+      - name: Build (Linux features)
+        run: cargo build --no-default-features --features system,cloud,sherpaonnx
 
       - name: Run tests
-        run: cargo test --all-features
+        run: cargo test --no-default-features --features system,cloud,sherpaonnx
 
-      - name: Build without default features (cloud only)
+      - name: Build cloud-only
         run: cargo build --no-default-features --features cloud
 
       - name: Upload C header
         uses: actions/upload-artifact@v4
         with:
           name: tts_wrapper_header
           path: include/tts_wrapper.h
+
+  macos-build:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy
+
+      - name: Clippy (macOS features)
+        run: cargo clippy --no-default-features --features avsynth,cloud -- -D warnings
+
+      - name: Build (macOS features)
+        run: cargo build --no-default-features --features avsynth,cloud
+
+      - name: Run tests
+        run: cargo test --no-default-features --features avsynth,cloud
+
+  windows-build:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy
+
+      - name: Clippy (Windows features)
+        run: cargo clippy --no-default-features --features sapi,cloud -- -D warnings
+
+      - name: Build (Windows features)
+        run: cargo build --no-default-features --features sapi,cloud
+
+      - name: Run tests
+        run: cargo test --no-default-features --features sapi,cloud
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -39,16 +39,14 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
       - name: Install system dependencies
         run: sudo apt-get update && sudo apt-get install -y libspeechd-dev libclang-dev
-      - name: Clippy (all features)
-        run: cargo clippy --all-features -- -D warnings
-      - name: Test (all features)
-        run: cargo test --all-features
+      - name: Clippy (Linux features)
+        run: cargo clippy --no-default-features --features system,cloud,sherpaonnx -- -D warnings
+      - name: Test (Linux features)
+        run: cargo test --no-default-features --features system,cloud,sherpaonnx
       - name: Build system-only
         run: cargo build --no-default-features --features system
       - name: Build cloud-only
         run: cargo build --no-default-features --features cloud
-      - name: Build with sherpaonnx
-        run: cargo build --no-default-features --features system,sherpaonnx
 
   build:
     name: Build ${{ matrix.label }}
@@ -57,11 +55,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - target: x86_64-unknown-linux-gnu
-            os: ubuntu-latest
-            features: "system"
-            label: "system-x86_64-linux"
-            lib_ext: so
           - target: x86_64-unknown-linux-gnu
             os: ubuntu-latest
             features: "system,cloud"
@@ -72,40 +65,46 @@ jobs:
             features: "system,cloud,sherpaonnx"
             label: "system-cloud-sherpaonnx-x86_64-linux"
             lib_ext: so
+          - target: aarch64-unknown-linux-gnu
+            os: ubuntu-latest
+            features: "system,cloud"
+            label: "system-cloud-aarch64-linux"
+            lib_ext: so
+            cross: true
           - target: x86_64-apple-darwin
             os: macos-latest
-            features: "cloud"
-            label: "cloud-x86_64-macos"
+            features: "avsynth,cloud"
+            label: "avsynth-cloud-x86_64-macos"
             lib_ext: dylib
           - target: aarch64-apple-darwin
             os: macos-latest
-            features: "cloud"
-            label: "cloud-aarch64-macos"
+            features: "avsynth,cloud"
+            label: "avsynth-cloud-aarch64-macos"
             lib_ext: dylib
           - target: x86_64-apple-darwin
             os: macos-latest
-            features: "cloud,sherpaonnx"
-            label: "cloud-sherpaonnx-x86_64-macos"
+            features: "avsynth,cloud,sherpaonnx"
+            label: "avsynth-cloud-sherpaonnx-x86_64-macos"
             lib_ext: dylib
           - target: aarch64-apple-darwin
             os: macos-latest
-            features: "cloud,sherpaonnx"
-            label: "cloud-sherpaonnx-aarch64-macos"
+            features: "avsynth,cloud,sherpaonnx"
+            label: "avsynth-cloud-sherpaonnx-aarch64-macos"
             lib_ext: dylib
           - target: x86_64-pc-windows-msvc
             os: windows-latest
-            features: "cloud"
-            label: "cloud-x86_64-windows"
+            features: "sapi,cloud"
+            label: "sapi-cloud-x86_64-windows"
             lib_ext: dll
           - target: aarch64-pc-windows-msvc
             os: windows-latest
-            features: "cloud"
-            label: "cloud-aarch64-windows"
+            features: "sapi,cloud"
+            label: "sapi-cloud-aarch64-windows"
             lib_ext: dll
           - target: x86_64-pc-windows-msvc
             os: windows-latest
-            features: "cloud,sherpaonnx"
-            label: "cloud-sherpaonnx-x86_64-windows"
+            features: "sapi,cloud,sherpaonnx"
+            label: "sapi-cloud-sherpaonnx-x86_64-windows"
             lib_ext: dll
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/extern/avsynth_shim.m b/extern/avsynth_shim.m
@@ -13,8 +13,7 @@
 void avsynth_destroy(void *handle) {
     if (!handle) return;
     @try {
-        AVSpeechSynthesizer *synth = (__bridge_transfer AVSpeechSynthesizer *)handle;
-        synth = nil;
+        CFRelease(handle);
     } @catch (NSException *e) {}
 }
 
diff --git a/include/tts_wrapper.h b/include/tts_wrapper.h
@@ -269,6 +269,34 @@ int32_t tts_synth_to_bytes(struct tts_ctx *ctx,
  */
 void tts_free_bytes(uint8_t *bytes, uintptr_t len);
 
+extern void *avsynth_create(void);
+
+extern void avsynth_destroy(void *handle);
+
+extern void avsynth_speak(void *handle,
+                          const uint8_t *text,
+                          const uint8_t *voice_id,
+                          float rate,
+                          float pitch,
+                          float volume);
+
+extern void avsynth_stop(void *handle);
+
+extern void avsynth_pause(void *handle);
+
+extern void avsynth_resume(void *handle);
+
+extern int32_t avsynth_voice_count(void *handle);
+
+extern int32_t avsynth_get_voice(void *handle,
+                                 int32_t index,
+                                 uint8_t *id_buf,
+                                 int32_t id_buf_len,
+                                 uint8_t *name_buf,
+                                 int32_t name_buf_len,
+                                 uint8_t *lang_buf,
+                                 int32_t lang_buf_len);
+
 #ifdef __cplusplus
 }  // extern "C"
 #endif  // __cplusplus
diff --git a/src/factory.rs b/src/factory.rs
@@ -4,16 +4,16 @@ use crate::engine::TtsEngine;
 use crate::types::EngineDescriptor;
 
 // The unused-import warning is a false positive — TtsEngine is a trait used as a dyn bound.
+#[cfg(all(feature = "avsynth", target_os = "macos"))]
+use crate::avsynth_engine::AvSynthEngine;
 #[cfg(feature = "cloud")]
 use crate::cloud_engine;
+#[cfg(all(feature = "sapi", target_os = "windows"))]
+use crate::sapi_engine::SapiEngine;
 #[cfg(feature = "sherpaonnx")]
 use crate::sherpaonnx_engine::SherpaOnnxEngine;
 #[cfg(feature = "system")]
 use crate::system_engine::SystemEngine;
-#[cfg(feature = "avsynth")]
-use crate::avsynth_engine::AvSynthEngine;
-#[cfg(feature = "sapi")]
-use crate::sapi_engine::SapiEngine;
 
 /// Create an engine by its string identifier.
 ///
@@ -26,10 +26,10 @@ pub fn create_engine(engine_id: &str, credentials_json: &str) -> Option<Box<dyn
         #[cfg(feature = "system")]
         "system" => Some(Box::new(SystemEngine::new())),
 
-        #[cfg(feature = "avsynth")]
+        #[cfg(all(feature = "avsynth", target_os = "macos"))]
         "avsynth" => Some(Box::new(AvSynthEngine::new())),
 
-        #[cfg(feature = "sapi")]
+        #[cfg(all(feature = "sapi", target_os = "windows"))]
         "sapi" => Some(Box::new(SapiEngine::new())),
 
         #[cfg(feature = "sherpaonnx")]
@@ -63,15 +63,15 @@ pub fn engine_list() -> Vec<EngineDescriptor> {
         credential_keys_json: "[]".into(),
     });
 
-    #[cfg(feature = "avsynth")]
+    #[cfg(all(feature = "avsynth", target_os = "macos"))]
     engines.push(EngineDescriptor {
         id: "avsynth".into(),
         name: "macOS AVSpeechSynthesizer".into(),
         needs_credentials: false,
         credential_keys_json: "[]".into(),
     });
 
-    #[cfg(feature = "sapi")]
+    #[cfg(all(feature = "sapi", target_os = "windows"))]
     engines.push(EngineDescriptor {
         id: "sapi".into(),
         name: "Windows SAPI".into(),
diff --git a/src/lib.rs b/src/lib.rs
@@ -29,18 +29,18 @@
     dead_code
 )]
 
+#[cfg(all(feature = "avsynth", target_os = "macos"))]
+mod avsynth_engine;
 #[cfg(feature = "cloud")]
 mod cloud_engine;
 pub mod engine;
 pub mod factory;
+#[cfg(all(feature = "sapi", target_os = "windows"))]
+mod sapi_engine;
 #[cfg(feature = "sherpaonnx")]
 mod sherpaonnx_engine;
 #[cfg(feature = "system")]
 mod system_engine;
-#[cfg(feature = "avsynth")]
-mod avsynth_engine;
-#[cfg(feature = "sapi")]
-mod sapi_engine;
 pub mod types;
 
 use std::ffi::{CStr, CString};
@@ -97,19 +97,15 @@ pub extern "C" fn tts_create(
     let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
         tts_create_inner(engine_id, credentials_json)
     }));
-    match result {
-        Ok(ptr) => ptr,
-        Err(_) => {
-            set_error("engine creation panicked");
-            ptr::null_mut()
-        }
+    if let Ok(ptr) = result {
+        ptr
+    } else {
+        set_error("engine creation panicked");
+        ptr::null_mut()
     }
 }
 
-fn tts_create_inner(
-    engine_id: *const c_char,
-    credentials_json: *const c_char,
-) -> *mut tts_ctx {
+fn tts_create_inner(engine_id: *const c_char, credentials_json: *const c_char) -> *mut tts_ctx {
     if engine_id.is_null() {
         set_error("engine_id is null");
         return ptr::null_mut();
@@ -324,10 +320,7 @@ pub extern "C" fn tts_get_voices(
     let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
         tts_get_voices_inner(ctx, out_voices, out_count)
     }));
-    match result {
-        Ok(r) => r,
-        Err(_) => -1,
-    }
+    result.unwrap_or(-1)
 }
 
 fn tts_get_voices_inner(
diff --git a/src/sapi_engine.rs b/src/sapi_engine.rs
@@ -5,11 +5,7 @@ use crate::types::{TtsError, TtsResult, Voice};
 use std::sync::Mutex;
 
 #[cfg(feature = "sapi")]
-use windows::{
-    core::*,
-    Win32::Media::Speech::*,
-    Win32::System::Com::*,
-};
+use windows::{core::*, Win32::Media::Speech::*, Win32::System::Com::*};
 
 #[derive(Debug)]
 pub struct SapiEngine {
@@ -37,7 +33,7 @@ impl SapiEngine {
     unsafe fn find_voice_by_id(voice_id: &str) -> Option<ISpObjectToken> {
         let target = HSTRING::from(voice_id);
         let enum_tokens = SpEnumTokens(
-            w"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\Voices",
+            &HSTRING::from("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\Voices"),
             None,
             None,
         )
@@ -104,7 +100,11 @@ impl TtsEngine for SapiEngine {
                 let pitch_val = pitch_to_sapi(pitch);
                 let pitch_str = format!(
                     "<pitch absmiddle=\"{}\"/>",
-                    if pitch >= 1.0 { pitch_val as i32 } else { -(pitch_val as i32) }
+                    if pitch >= 1.0 {
+                        pitch_val as i32
+                    } else {
+                        -(pitch_val as i32)
+                    }
                 );
                 let wrapped = format!("{pitch_str}{text}");
                 let wtext = HSTRING::from(&wrapped);
@@ -175,15 +175,16 @@ impl TtsEngine for SapiEngine {
     fn get_voices(&self) -> TtsResult<Vec<Voice>> {
         let tokens = unsafe {
             SpEnumTokens(
-                w"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\Voices",
+                &HSTRING::from("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\Voices"),
                 None,
                 None,
             )
             .map_err(|e| TtsError(format!("Failed to enumerate SAPI voices: {e}")))?
         };
 
         let count = unsafe { tokens.GetCount() }
-            .map_err(|e| TtsError(format!("Failed to get voice count: {e}")))? as usize;
+            .map_err(|e| TtsError(format!("Failed to get voice count: {e}")))?
+            as usize;
 
         let mut voices = Vec::with_capacity(count);
         for i in 0..count {
@@ -193,19 +194,22 @@ impl TtsEngine for SapiEngine {
                     .unwrap_or_default();
 
                 let name = unsafe {
-                    token.GetStringValue(w"Name")
+                    token
+                        .GetStringValue(&HSTRING::from("Name"))
                         .map(|h| h.to_string_lossy())
                         .unwrap_or_else(|_| id.clone())
                 };
 
                 let lang = unsafe {
-                    token.GetStringValue(w"Language")
+                    token
+                        .GetStringValue(&HSTRING::from("Language"))
                         .map(|h| h.to_string_lossy())
                         .unwrap_or_else(|_| "en-US".into())
                 };
 
                 let gender_str = unsafe {
-                    token.GetStringValue(w"Gender")
+                    token
+                        .GetStringValue(&HSTRING::from("Gender"))
                         .map(|h| h.to_string_lossy())
                         .unwrap_or_default()
                 };

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,7 @@`
`13`	`13`	`void avsynth_destroy(void *handle) {`
`14`	`14`	`if (!handle) return;`
`15`	`15`	`@try {`
`16`		`- AVSpeechSynthesizer synth = (__bridge_transfer AVSpeechSynthesizer )handle;`
`17`		`- synth = nil;`
	`16`	`+ CFRelease(handle);`
`18`	`17`	`} @catch (NSException *e) {}`
`19`	`18`	`}`
`20`	`19`