feat: implement Send and Sync traits for TTS and AudioTag structs (#77)

* feat: implement Send and Sync traits for TTS and AudioTag structs

* bump: update sherpa-rs and sherpa-rs-sys versions to 0.6.4

Author: thewh1teagle

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "sherpa-rs-sys"
-version = "0.6.3"
+version = "0.6.4"
 edition = "2021"
 authors = ["thewh1teagle"]
 homepage = "https://github.com/thewh1teagle/sherpa-rs"

crates/sherpa-rs-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sherpa-rs"
-version = "0.6.3"
+version = "0.6.4"
 edition = "2021"
 authors = ["thewh1teagle"]
 license = "MIT"
@@ -21,7 +21,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 eyre = "0.6.12"
 hound = { version = "3.5.1" }
-sherpa-rs-sys = { path = "../sherpa-rs-sys", version = "0.6.3", default-features = false }
+sherpa-rs-sys = { path = "../sherpa-rs-sys", version = "0.6.4", default-features = false }
 tracing = "0.1.40"
 
 [dev-dependencies]

crates/sherpa-rs/Cargo.toml

@@ -46,7 +46,7 @@ impl AudioTag {
         let audio_tag = unsafe { sherpa_rs_sys::SherpaOnnxCreateAudioTagging(&sherpa_config) };
 
         if audio_tag.is_null() {
-            bail!("Failed to create audio tagging")
+            bail!("Failed to create audio tagging");
         }
         Ok(Self {
             audio_tag,
@@ -64,6 +64,7 @@ impl AudioTag {
                 samples.as_ptr(),
                 samples.len() as i32,
             );
+
             let results = sherpa_rs_sys::SherpaOnnxAudioTaggingCompute(
                 self.audio_tag,
                 stream,
@@ -75,7 +76,20 @@ impl AudioTag {
                 let event_name = cstr_to_string((*event).name);
                 events.push(event_name);
             }
+
+            sherpa_rs_sys::SherpaOnnxDestroyOfflineStream(stream);
         }
         events
     }
 }
+
+unsafe impl Send for AudioTag {}
+unsafe impl Sync for AudioTag {}
+
+impl Drop for AudioTag {
+    fn drop(&mut self) {
+        unsafe {
+            sherpa_rs_sys::SherpaOnnxDestroyAudioTagging(self.audio_tag);
+        }
+    }
+}

crates/sherpa-rs/src/audio_tag.rs

@@ -1,6 +1,6 @@
 use crate::{get_default_provider, utils::RawCStr};
 use eyre::{bail, Result};
-use std::path::Path;
+use std::{path::Path, ptr::null_mut};
 
 #[derive(Debug)]
 pub struct Diarize {
@@ -14,7 +14,7 @@ pub struct Segment {
     pub speaker: i32,
 }
 
-type ProgressCallback = Box<dyn Fn(i32, i32) -> i32 + Send + 'static>;
+type ProgressCallback = Box<dyn (Fn(i32, i32) -> i32) + Send + 'static>;
 
 #[derive(Debug, Clone)]
 pub struct DiarizeConfig {
@@ -85,7 +85,7 @@ impl Diarize {
         let sd = unsafe { sherpa_rs_sys::SherpaOnnxCreateOfflineSpeakerDiarization(&config) };
 
         if sd.is_null() {
-            bail!("Failed to initialize offline speaker diarization")
+            bail!("Failed to initialize offline speaker diarization");
         }
         Ok(Self { sd })
     }
@@ -103,7 +103,7 @@ impl Diarize {
             let callback_ptr = callback_box
                 .as_mut()
                 .map(|b| b.as_mut() as *mut ProgressCallback as *mut std::ffi::c_void)
-                .unwrap_or(std::ptr::null_mut());
+                .unwrap_or(null_mut());
 
             let result = sherpa_rs_sys::SherpaOnnxOfflineSpeakerDiarizationProcessWithCallback(
                 self.sd,
@@ -123,8 +123,9 @@ impl Diarize {
                 sherpa_rs_sys::SherpaOnnxOfflineSpeakerDiarizationResultSortByStartTime(result);
 
             if !segments_ptr.is_null() && num_segments > 0 {
-                let segments_result: &[sherpa_rs_sys::SherpaOnnxOfflineSpeakerDiarizationSegment] =
-                    std::slice::from_raw_parts(segments_ptr, num_segments as usize);
+                let segments_result: &[
+                    sherpa_rs_sys::SherpaOnnxOfflineSpeakerDiarizationSegment
+                ] = std::slice::from_raw_parts(segments_ptr, num_segments as usize);
 
                 for segment in segments_result {
                     // Use segment here

crates/sherpa-rs/src/diarize.rs

@@ -63,3 +63,14 @@ impl KokoroTts {
         unsafe { super::create(self.tts, text, sid, speed) }
     }
 }
+
+unsafe impl Send for KokoroTts {}
+unsafe impl Sync for KokoroTts {}
+
+impl Drop for KokoroTts {
+    fn drop(&mut self) {
+        unsafe {
+            sherpa_rs_sys::SherpaOnnxDestroyOfflineTts(self.tts);
+        }
+    }
+}

crates/sherpa-rs/src/tts/kokoro.rs

@@ -75,3 +75,14 @@ impl MatchaTts {
         unsafe { super::create(self.tts, text, sid, speed) }
     }
 }
+
+unsafe impl Send for MatchaTts {}
+unsafe impl Sync for MatchaTts {}
+
+impl Drop for MatchaTts {
+    fn drop(&mut self) {
+        unsafe {
+            sherpa_rs_sys::SherpaOnnxDestroyOfflineTts(self.tts);
+        }
+    }
+}

crates/sherpa-rs/src/tts/matcha.rs

@@ -71,3 +71,14 @@ impl VitsTts {
         unsafe { super::create(self.tts, text, sid, speed) }
     }
 }
+
+unsafe impl Send for VitsTts {}
+unsafe impl Sync for VitsTts {}
+
+impl Drop for VitsTts {
+    fn drop(&mut self) {
+        unsafe {
+            sherpa_rs_sys::SherpaOnnxDestroyOfflineTts(self.tts);
+        }
+    }
+}