Fix setting speaker ID for Android TTS Engine. (#530)

k2-fsa · Jan 15, 2024 · f4e3f45 · f4e3f45
1 parent 229853b
commit f4e3f45
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/android/SherpaOnnxTts/app/src/main/java/com/k2fsa/sherpa/onnx/MainActivity.kt b/android/SherpaOnnxTts/app/src/main/java/com/k2fsa/sherpa/onnx/MainActivity.kt
@@ -184,7 +184,7 @@ class MainActivity : AppCompatActivity() {
         // modelDir = "vits-zh-aishell3"
         // modelName = "vits-aishell3.onnx"
         // ruleFsts = "vits-zh-aishell3/rule.fst"
-        // lexcion = "lexicon.txt"
+        // lexicon = "lexicon.txt"
 
         if (dataDir != null) {
             val newDir = copyDataDir(modelDir)

diff --git a/...id/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/MainActivity.kt b/...id/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/MainActivity.kt
@@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
@@ -32,6 +33,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.k2fsa.sherpa.onnx.tts.engine.ui.theme.SherpaOnnxTtsEngineTheme
@@ -65,22 +67,31 @@ class MainActivity : ComponentActivity() {
                                 }
                                 var testText by remember { mutableStateOf("") }
 
-                                OutlinedTextField(value = testText,
+                                OutlinedTextField(
+                                    value = testText,
                                     onValueChange = { testText = it },
-                                            label = { Text ("Test text") },
-                                    modifier = Modifier.fillMaxWidth().wrapContentHeight().padding(16.dp),
+                                    label = { Text("Test text") },
+                                    modifier = Modifier
+                                        .fillMaxWidth()
+                                        .wrapContentHeight()
+                                        .padding(16.dp),
                                     singleLine = false,
                                 )
 
                                 val numSpeakers = TtsEngine.tts!!.numSpeakers()
                                 if (numSpeakers > 1) {
                                     Row {
                                         Text("Speaker ID: (0-${numSpeakers - 1})")
-                                        Slider(
-                                            value = TtsEngine.speakerIdState.value.toFloat(),
-                                            onValueChange = { TtsEngine.speakerId = it.toInt() },
-                                            valueRange = 0.0f..(numSpeakers - 1).toFloat(),
-                                            steps = 1
+                                        OutlinedTextField(
+                                            value = TtsEngine.speakerIdState.value.toString(),
+                                            onValueChange = {
+                                                if (it.isEmpty() || it.isBlank()) {
+                                                    TtsEngine.speakerId = 0
+                                                } else {
+                                                    TtsEngine.speakerId = it.toString().toInt()
+                                                }
+                                            },
+                                            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number)
                                         )
                                     }
                                 }

diff --git a/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/TtsEngine.kt b/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/TtsEngine.kt
@@ -87,7 +87,7 @@ object TtsEngine {
         // modelDir = "vits-zh-aishell3"
         // modelName = "vits-aishell3.onnx"
         // ruleFsts = "vits-zh-aishell3/rule.fst"
-        // lexcion = "lexicon.txt"
+        // lexicon = "lexicon.txt"
         // lang = "zho"
 
         if (dataDir != null) {

diff --git a/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/TtsService.kt b/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/TtsService.kt
@@ -81,11 +81,11 @@ class TtsService : TextToSpeechService() {
     override fun onLoadLanguage(_lang: String?, _country: String?, _variant: String?): Int {
         val lang = _lang ?: ""
 
-        if (lang == TtsEngine.lang) {
+        return if (lang == TtsEngine.lang) {
             TtsEngine.createTts(application)
-            return TextToSpeech.LANG_AVAILABLE
+            TextToSpeech.LANG_AVAILABLE
         } else {
-            return TextToSpeech.LANG_NOT_SUPPORTED
+            TextToSpeech.LANG_NOT_SUPPORTED
         }
     }