From 6c12590d21a3f8b8cfcd7e5c009940e445cbbcd9 Mon Sep 17 00:00:00 2001
From: Fangjun Kuang <csukuangfj@gmail.com>
Date: Wed, 12 Jun 2024 11:42:19 +0800
Subject: [PATCH] Fix CI errors. (#993)

---
 .github/workflows/flutter-linux.yaml                  |  7 +------
 CMakeLists.txt                                        |  4 +---
 .../com/k2fsa/sherpa/onnx/tts/engine/GetSampleText.kt |  4 ++++
 .../com/k2fsa/sherpa/onnx/tts/engine/MainActivity.kt  |  1 +
 .../k2fsa/sherpa/onnx/tts/engine/PreferencesHelper.kt | 11 +++++++++++
 .../com/k2fsa/sherpa/onnx/tts/engine/TtsEngine.kt     |  1 +
 build-swift-macos.sh                                  |  1 -
 7 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/flutter-linux.yaml b/.github/workflows/flutter-linux.yaml
index 80a31267..a74f4500 100644
--- a/.github/workflows/flutter-linux.yaml
+++ b/.github/workflows/flutter-linux.yaml
@@ -89,18 +89,13 @@ jobs:
 
           flutter --version
 
-          mkdir -p /__t/flutter-Linux-3.22.1-X64/flutter
-
-          git config --global --add safe.directory /__t/flutter-Linux-3.22.1-X64/flutter
+          git config --global --add safe.directory /__t/flutter-Linux-*/flutter || true
 
           flutter --version
 
           dart --version
           flutter doctor
 
-
-          flutter doctor
-
       - name: Install libgtk-3-dev
         shell: bash
         run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 584583ba..7302a16b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,11 +2,9 @@ cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14" CACHE STRING "Minimum OS X deployment version. Used only for macOS")
 
-
-
 project(sherpa-onnx)
 
-set(SHERPA_ONNX_VERSION "1.9.27")
+set(SHERPA_ONNX_VERSION "1.9.28")
 
 # Disable warning about
 #
diff --git a/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/GetSampleText.kt b/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/GetSampleText.kt
index 61e68373..a01e0a7b 100644
--- a/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/GetSampleText.kt
+++ b/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/GetSampleText.kt
@@ -25,6 +25,10 @@ fun getSampleText(lang: String): String {
             text = "Aquest és un motor de text a veu que utilitza Kaldi de nova generació"
         }
 
+        "cym" -> {
+            text = "Peiriant testun-i-lais yw hwn sy'n defnyddio Kaldi'r genhedlaeth nesaf"
+        }
+
         "ces" -> {
             text = "Toto je převodník textu na řeč využívající novou generaci kaldi"
         }
diff --git a/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/MainActivity.kt b/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/MainActivity.kt
index f64b05f4..9a6bd47a 100644
--- a/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/MainActivity.kt
+++ b/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/MainActivity.kt
@@ -93,6 +93,7 @@ class MainActivity : ComponentActivity() {
                                                     TtsEngine.speakerId = 0
                                                 }
                                             }
+                                            preferenceHelper.setSid(TtsEngine.speakerId)
                                         },
                                         label = {
                                             Text("Speaker ID: (0-${numSpeakers - 1})")
diff --git a/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/PreferencesHelper.kt b/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/PreferencesHelper.kt
index 94c71f47..57a6e324 100644
--- a/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/PreferencesHelper.kt
+++ b/android/SherpaOnnxTtsEngine/app/src/main/java/com/k2fsa/sherpa/onnx/tts/engine/PreferencesHelper.kt
@@ -5,6 +5,7 @@ class PreferenceHelper(context: Context) {
 
     private val PREFS_NAME = "com.k2fsa.sherpa.onnx.tts.engine"
     private val SPEED_KEY = "speed"
+    private val SID_KEY = "speaker_id"
 
     private val sharedPreferences: SharedPreferences =
         context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
@@ -18,4 +19,14 @@ class PreferenceHelper(context: Context) {
     fun getSpeed(): Float {
         return sharedPreferences.getFloat(SPEED_KEY, 1.0f)
     }
+
+    fun setSid(value: Int) {
+        val editor = sharedPreferences.edit()
+        editor.putInt(SID_KEY, value)
+        editor.apply()
+    }
+
+    fun getSid(): Int {
+        return sharedPreferences.getInt(SID_KEY, 0)
+    }
 }
\ No newline at end of file
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
index 49d79401..480f8a38 100644
--- 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
@@ -138,6 +138,7 @@ object TtsEngine {
         )
 
         speed = PreferenceHelper(context).getSpeed()
+        speakerId = PreferenceHelper(context).getSid()
 
         tts = OfflineTts(assetManager = assets, config = config)
     }
diff --git a/build-swift-macos.sh b/build-swift-macos.sh
index cebfa295..f41dd7d5 100755
--- a/build-swift-macos.sh
+++ b/build-swift-macos.sh
@@ -7,7 +7,6 @@ mkdir -p $dir
 cd $dir
 
 cmake \
-  -DCMAKE_OSX_ARCHITECTURES="x86_64" \
   -DCMAKE_INSTALL_PREFIX=./install \
   -DCMAKE_BUILD_TYPE=Release \
   -DBUILD_SHARED_LIBS=OFF \