@@ -172,14 +172,14 @@ class CardMediaPlayer : Closeable {
172172 }
173173 }
174174
175- suspend fun autoplayAllForSide (cardSide : CardSide ): Job ? {
175+ fun autoplayAllForSide (cardSide : CardSide ): Job ? {
176176 if (config.autoplay) {
177177 return playAllForSide(cardSide)
178178 }
179179 return null
180180 }
181181
182- suspend fun playAllForSide (cardSide : CardSide ): Job ? {
182+ fun playAllForSide (cardSide : CardSide ): Job ? {
183183 if (! isEnabled) return null
184184 playAvTagsJob {
185185 Timber .i(" playing sounds for %s" , cardSide)
@@ -336,7 +336,7 @@ class CardMediaPlayer : Closeable {
336336 /* *
337337 * Plays all sounds for the current side, calling [onMediaGroupCompleted] when completed
338338 */
339- suspend fun playAll (side : SingleCardSide ) =
339+ fun playAll (side : SingleCardSide ) =
340340 when (side) {
341341 SingleCardSide .FRONT -> playAllForSide(CardSide .QUESTION )
342342 SingleCardSide .BACK -> playAllForSide(CardSide .ANSWER )
@@ -345,7 +345,7 @@ class CardMediaPlayer : Closeable {
345345 /* *
346346 * Replays all sounds for [side], calling [onMediaGroupCompleted] when completed
347347 */
348- suspend fun replayAll (side : SingleCardSide ) =
348+ fun replayAll (side : SingleCardSide ) =
349349 when (side) {
350350 SingleCardSide .BACK -> if (config.replayQuestion) playAllForSide(CardSide .BOTH ) else playAllForSide(CardSide .ANSWER )
351351 SingleCardSide .FRONT -> playAllForSide(CardSide .QUESTION )
@@ -365,8 +365,7 @@ class CardMediaPlayer : Closeable {
365365 }
366366
367367 /* * Ensures that only one [playAvTagsJob] is running at once */
368- // TODO: make non-suspend
369- private suspend fun playAvTagsJob (block : suspend CoroutineScope .() -> Unit ) {
368+ private fun playAvTagsJob (block : suspend CoroutineScope .() -> Unit ) {
370369 val oldJob = playAvTagsJob
371370 this .playAvTagsJob =
372371 scope.launch {
@@ -448,8 +447,6 @@ enum class MediaErrorBehavior {
448447fun AbstractFlashcardViewer.createMediaErrorListener (): MediaErrorListener {
449448 val activity = this
450449 return object : MediaErrorListener {
451- private var handledError: HashSet <String > = hashSetOf()
452-
453450 override fun onMediaPlayerError (
454451 mp : MediaPlayer ? ,
455452 which : Int ,
0 commit comments