nolan
/
tts-rs
mirror of https://github.com/ndarilek/tts-rs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Complete migration to jni 0.21.

This commit is contained in:
Nolan Darilek 2023-03-06 15:25:49 -06:00
parent bf8eb07866
commit 7e761e1267
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/backends/android.rs
View File

@ -28,7 +28,7 @@ lazy_static! {
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[no_mangle] #[no_mangle]
pub extern "system" fn JNI_OnLoad(vm: JavaVM, _: *mut c_void) -> jint { pub extern "system" fn JNI_OnLoad(vm: JavaVM, _: *mut c_void) -> jint {
let env = vm.get_env().expect("Cannot get reference to the JNIEnv"); let mut env = vm.get_env().expect("Cannot get reference to the JNIEnv");
let b = env let b = env
.find_class("rs/tts/Bridge") .find_class("rs/tts/Bridge")
.expect("Failed to find `Bridge`"); .expect("Failed to find `Bridge`");
@ -42,7 +42,7 @@ pub extern "system" fn JNI_OnLoad(vm: JavaVM, _: *mut c_void) -> jint {
#[no_mangle] #[no_mangle]
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub unsafe extern "C" fn Java_rs_tts_Bridge_onInit(env: JNIEnv, obj: JObject, status: jint) { pub unsafe extern "C" fn Java_rs_tts_Bridge_onInit(mut env: JNIEnv, obj: JObject, status: jint) {
let id = env let id = env
.get_field(obj, "backendId", "I") .get_field(obj, "backendId", "I")
.expect("Failed to get backend ID") .expect("Failed to get backend ID")
@ -58,7 +58,7 @@ pub unsafe extern "C" fn Java_rs_tts_Bridge_onInit(env: JNIEnv, obj: JObject, st
#[no_mangle] #[no_mangle]
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub unsafe extern "C" fn Java_rs_tts_Bridge_onStart( pub unsafe extern "C" fn Java_rs_tts_Bridge_onStart(
env: JNIEnv, mut env: JNIEnv,
obj: JObject, obj: JObject,
utterance_id: JString, utterance_id: JString,
) { ) {
@ -69,7 +69,7 @@ pub unsafe extern "C" fn Java_rs_tts_Bridge_onStart(
.expect("Failed to cast to int") as u64; .expect("Failed to cast to int") as u64;
let backend_id = BackendId::Android(backend_id); let backend_id = BackendId::Android(backend_id);
let utterance_id = CString::from(CStr::from_ptr( let utterance_id = CString::from(CStr::from_ptr(
env.get_string(utterance_id).unwrap().as_ptr(), env.get_string(&utterance_id).unwrap().as_ptr(),
)) ))
.into_string() .into_string()
.unwrap(); .unwrap();
@ -85,7 +85,7 @@ pub unsafe extern "C" fn Java_rs_tts_Bridge_onStart(
#[no_mangle] #[no_mangle]
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub unsafe extern "C" fn Java_rs_tts_Bridge_onStop( pub unsafe extern "C" fn Java_rs_tts_Bridge_onStop(
env: JNIEnv, mut env: JNIEnv,
obj: JObject, obj: JObject,
utterance_id: JString, utterance_id: JString,
) { ) {
@ -96,7 +96,7 @@ pub unsafe extern "C" fn Java_rs_tts_Bridge_onStop(
.expect("Failed to cast to int") as u64; .expect("Failed to cast to int") as u64;
let backend_id = BackendId::Android(backend_id); let backend_id = BackendId::Android(backend_id);
let utterance_id = CString::from(CStr::from_ptr( let utterance_id = CString::from(CStr::from_ptr(
env.get_string(utterance_id).unwrap().as_ptr(), env.get_string(&utterance_id).unwrap().as_ptr(),
)) ))
.into_string() .into_string()
.unwrap(); .unwrap();
@ -112,7 +112,7 @@ pub unsafe extern "C" fn Java_rs_tts_Bridge_onStop(
#[no_mangle] #[no_mangle]
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub unsafe extern "C" fn Java_rs_tts_Bridge_onDone( pub unsafe extern "C" fn Java_rs_tts_Bridge_onDone(
env: JNIEnv, mut env: JNIEnv,
obj: JObject, obj: JObject,
utterance_id: JString, utterance_id: JString,
) { ) {
@ -123,7 +123,7 @@ pub unsafe extern "C" fn Java_rs_tts_Bridge_onDone(
.expect("Failed to cast to int") as u64; .expect("Failed to cast to int") as u64;
let backend_id = BackendId::Android(backend_id); let backend_id = BackendId::Android(backend_id);
let utterance_id = CString::from(CStr::from_ptr( let utterance_id = CString::from(CStr::from_ptr(
env.get_string(utterance_id).unwrap().as_ptr(), env.get_string(&utterance_id).unwrap().as_ptr(),
)) ))
.into_string() .into_string()
.unwrap(); .unwrap();
@ -139,7 +139,7 @@ pub unsafe extern "C" fn Java_rs_tts_Bridge_onDone(
#[no_mangle] #[no_mangle]
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub unsafe extern "C" fn Java_rs_tts_Bridge_onError( pub unsafe extern "C" fn Java_rs_tts_Bridge_onError(
env: JNIEnv, mut env: JNIEnv,
obj: JObject, obj: JObject,
utterance_id: JString, utterance_id: JString,
) { ) {
@ -150,7 +150,7 @@ pub unsafe extern "C" fn Java_rs_tts_Bridge_onError(
.expect("Failed to cast to int") as u64; .expect("Failed to cast to int") as u64;
let backend_id = BackendId::Android(backend_id); let backend_id = BackendId::Android(backend_id);
let utterance_id = CString::from(CStr::from_ptr( let utterance_id = CString::from(CStr::from_ptr(
env.get_string(utterance_id).unwrap().as_ptr(), env.get_string(&utterance_id).unwrap().as_ptr(),
)) ))
.into_string() .into_string()
.unwrap(); .unwrap();
@ -182,20 +182,20 @@ impl Android {
let ctx = ndk_context::android_context(); let ctx = ndk_context::android_context();
let vm = unsafe { jni::JavaVM::from_raw(ctx.vm().cast()) }?; let vm = unsafe { jni::JavaVM::from_raw(ctx.vm().cast()) }?;
let context = unsafe { JObject::from_raw(ctx.context().cast()) }; let context = unsafe { JObject::from_raw(ctx.context().cast()) };
let env = vm.attach_current_thread_permanently()?; let mut env = vm.attach_current_thread_permanently()?;
let bridge = BRIDGE.lock().unwrap(); let bridge = BRIDGE.lock().unwrap();
if let Some(bridge) = &*bridge { if let Some(bridge) = &*bridge {
let bridge = env.new_object(bridge, "(I)V", &[(bid as jint).into()])?; let bridge = env.new_object(bridge, "(I)V", &[(bid as jint).into()])?;
let tts = env.new_object( let tts = env.new_object(
"android/speech/tts/TextToSpeech", "android/speech/tts/TextToSpeech",
"(Landroid/content/Context;Landroid/speech/tts/TextToSpeech$OnInitListener;)V", "(Landroid/content/Context;Landroid/speech/tts/TextToSpeech$OnInitListener;)V",
&[context.into(), bridge.into()], &[(&context).into(), (&bridge).into()],
)?; )?;
env.call_method( env.call_method(
tts, &tts,
"setOnUtteranceProgressListener", "setOnUtteranceProgressListener",
"(Landroid/speech/tts/UtteranceProgressListener;)I", "(Landroid/speech/tts/UtteranceProgressListener;)I",
&[bridge.into()], &[(&bridge).into()],
)?; )?;
{ {
let mut pending = PENDING_INITIALIZATIONS.write().unwrap(); let mut pending = PENDING_INITIALIZATIONS.write().unwrap();
@ -255,7 +255,7 @@ impl Backend for Android {
fn speak(&mut self, text: &str, interrupt: bool) -> Result<Option<UtteranceId>, Error> { fn speak(&mut self, text: &str, interrupt: bool) -> Result<Option<UtteranceId>, Error> {
let vm = Self::vm()?; let vm = Self::vm()?;
let env = vm.get_env()?; let mut env = vm.get_env()?;
let tts = self.tts.as_obj(); let tts = self.tts.as_obj();
let text = env.new_string(text)?; let text = env.new_string(text)?;
let queue_mode = if interrupt { 0 } else { 1 }; let queue_mode = if interrupt { 0 } else { 1 };
@ -270,10 +270,10 @@ impl Backend for Android {
"speak", "speak",
"(Ljava/lang/CharSequence;ILandroid/os/Bundle;Ljava/lang/String;)I", "(Ljava/lang/CharSequence;ILandroid/os/Bundle;Ljava/lang/String;)I",
&[ &[
text.into(), (&text).into(),
queue_mode.into(), queue_mode.into(),
JObject::null().into(), (&JObject::null()).into(),
uid.into(), (&uid).into(),
], ],
)?; )?;
let rv = rv.i()?; let rv = rv.i()?;
@ -286,7 +286,7 @@ impl Backend for Android {
fn stop(&mut self) -> Result<(), Error> { fn stop(&mut self) -> Result<(), Error> {
let vm = Self::vm()?; let vm = Self::vm()?;
let env = vm.get_env()?; let mut env = vm.get_env()?;
let tts = self.tts.as_obj(); let tts = self.tts.as_obj();
let rv = env.call_method(tts, "stop", "()I", &[])?; let rv = env.call_method(tts, "stop", "()I", &[])?;
let rv = rv.i()?; let rv = rv.i()?;
@ -315,7 +315,7 @@ impl Backend for Android {
fn set_rate(&mut self, rate: f32) -> Result<(), Error> { fn set_rate(&mut self, rate: f32) -> Result<(), Error> {
let vm = Self::vm()?; let vm = Self::vm()?;
let env = vm.get_env()?; let mut env = vm.get_env()?;
let tts = self.tts.as_obj(); let tts = self.tts.as_obj();
let rate = rate as jfloat; let rate = rate as jfloat;
let rv = env.call_method(tts, "setSpeechRate", "(F)I", &[rate.into()])?; let rv = env.call_method(tts, "setSpeechRate", "(F)I", &[rate.into()])?;
@ -346,7 +346,7 @@ impl Backend for Android {
fn set_pitch(&mut self, pitch: f32) -> Result<(), Error> { fn set_pitch(&mut self, pitch: f32) -> Result<(), Error> {
let vm = Self::vm()?; let vm = Self::vm()?;
let env = vm.get_env()?; let mut env = vm.get_env()?;
let tts = self.tts.as_obj(); let tts = self.tts.as_obj();
let pitch = pitch as jfloat; let pitch = pitch as jfloat;
let rv = env.call_method(tts, "setPitch", "(F)I", &[pitch.into()])?; let rv = env.call_method(tts, "setPitch", "(F)I", &[pitch.into()])?;
@ -381,7 +381,7 @@ impl Backend for Android {
fn is_speaking(&self) -> Result<bool, Error> { fn is_speaking(&self) -> Result<bool, Error> {
let vm = Self::vm()?; let vm = Self::vm()?;
let env = vm.get_env()?; let mut env = vm.get_env()?;
let tts = self.tts.as_obj(); let tts = self.tts.as_obj();
let rv = env.call_method(tts, "isSpeaking", "()Z", &[])?; let rv = env.call_method(tts, "isSpeaking", "()Z", &[])?;
let rv = rv.z()?; let rv = rv.z()?;