fix: 插件TTS的附加数据混乱问题

jing332 · Jul 23, 2023 · 12663ed · 12663ed
1 parent fa54a99
commit 12663ed
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/app/src/main/java/com/github/jing332/tts_server_android/model/rhino/tts/TtsPluginEngine.kt b/app/src/main/java/com/github/jing332/tts_server_android/model/rhino/tts/TtsPluginEngine.kt
@@ -13,7 +13,7 @@ import java.io.ByteArrayInputStream
 import java.io.InputStream
 
 open class TtsPluginEngine(
- private val pluginTTS: PluginTTS,
+ val pluginTTS: PluginTTS,
  private val context: Context,
  override val rhino: RhinoScriptEngine = RhinoScriptEngine(),
  override val logger: Logger = Logger(),

diff --git a/app/src/main/java/com/github/jing332/tts_server_android/model/speech/tts/PluginTTS.kt b/app/src/main/java/com/github/jing332/tts_server_android/model/speech/tts/PluginTTS.kt
@@ -95,8 +95,21 @@ data class PluginTTS(
  }
 
  override suspend fun getAudio(speakText: String, rate: Int, pitch: Int): InputStream? {
- return pluginEngine?.getAudio(
- speakText, rate, pitch
- )
+ pluginEngine?.let {
+ return if (it.pluginTTS === this) {
+ it.getAudio(speakText, rate, pitch)
+ } else {
+ return TtsPluginEngine(
+ this,
+ context,
+ pluginEngine!!.rhino,
+ pluginEngine!!.logger
+ ).getAudio(
+ speakText, rate, pitch
+ )
+ }
+ }
+
+ return null
  }
 }