Fix race condition in TtsPlayer.restartUtterance()

mickael-menu · mickael-menu · commit 4653ec1151c1 · 2024-04-04T14:12:35.000+02:00
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
@@ -322,10 +322,12 @@ internal class TtsPlayer<S : TtsEngine.Settings, P : TtsEngine.Preferences<P>,
         }
 
         coroutineScope.launch {
-            playbackJob?.cancel()
-            playbackJob?.join()
-            utteranceMutable.value = utteranceMutable.value.copy(range = null)
-            playIfReadyAndNotPaused()
+            mutex.withLock {
+                playbackJob?.cancel()
+                playbackJob?.join()
+                utteranceMutable.value = utteranceMutable.value.copy(range = null)
+                playIfReadyAndNotPaused()
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -322,10 +322,12 @@ internal class TtsPlayer<S : TtsEngine.Settings, P : TtsEngine.Preferences<P>,`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`coroutineScope.launch {`
`325`		`- playbackJob?.cancel()`
`326`		`- playbackJob?.join()`
`327`		`- utteranceMutable.value = utteranceMutable.value.copy(range = null)`
`328`		`- playIfReadyAndNotPaused()`
	`325`	`+ mutex.withLock {`
	`326`	`+ playbackJob?.cancel()`
	`327`	`+ playbackJob?.join()`
	`328`	`+ utteranceMutable.value = utteranceMutable.value.copy(range = null)`
	`329`	`+ playIfReadyAndNotPaused()`
	`330`	`+ }`
`329`	`331`	`}`
`330`	`332`	`}`
`331`	`333`