Don't restart utterance in TTS when submitting the same preferences a…

…gain (readium#530)
marshal1919 · Jun 7, 2024 · acac9b4 · acac9b4
1 parent 852d1c9
commit acac9b4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/readium/navigators/media/tts/src/main/java/org/readium/navigator/media/tts/TtsNavigator.kt b/readium/navigators/media/tts/src/main/java/org/readium/navigator/media/tts/TtsNavigator.kt
@@ -170,7 +170,6 @@ public class TtsNavigator<S : TtsEngine.Settings, P : TtsEngine.Preferences<P>,
 
     override fun submitPreferences(preferences: P) {
         player.submitPreferences(preferences)
-        player.restartUtterance()
     }
 
     private fun navigatorPlayback(playback: TtsPlayer.Playback, utterance: TtsPlayer.Utterance) =

diff --git a/readium/navigators/media/tts/src/main/java/org/readium/navigator/media/tts/TtsPlayer.kt b/readium/navigators/media/tts/src/main/java/org/readium/navigator/media/tts/TtsPlayer.kt
@@ -196,7 +196,7 @@ internal class TtsPlayer<S : TtsEngine.Settings, P : TtsEngine.Preferences<P>,
         initialPreferences
 
     init {
-        submitPreferences(initialPreferences)
+        submitPreferencesForSure(initialPreferences)
     }
 
     fun play() {
@@ -560,6 +560,15 @@ internal class TtsPlayer<S : TtsEngine.Settings, P : TtsEngine.Preferences<P>,
     }
 
     override fun submitPreferences(preferences: P) {
+        if (preferences == lastPreferences) {
+            return
+        }
+
+        submitPreferencesForSure(preferences)
+        restartUtterance()
+    }
+
+    private fun submitPreferencesForSure(preferences: P) {
         lastPreferences = preferences
         engineFacade.submitPreferences(preferences)
         contentIterator.language = engineFacade.settings.value.language