Skip to content
Snippets Groups Projects
Commit 211b993e authored by Robert Stone's avatar Robert Stone Committed by Nicolas Pomepuy
Browse files

Invoke playback service on the main thread

parent cbf8bd4f
No related branches found
No related tags found
1 merge request!1163Fix voice command exception and improve behavior
......@@ -283,10 +283,12 @@ internal class MediaSessionCallback(private val playbackService: PlaybackService
}
if (!isActive) return@launch
if (tracks.isNullOrEmpty() && !items.isNullOrEmpty()) tracks = items[0].tracks
when {
!tracks.isNullOrEmpty() -> loadMedia(tracks?.toList())
playbackService.hasMedia() -> playbackService.play()
else -> playbackService.displayPlaybackError(R.string.search_no_result)
playbackService.lifecycleScope.launch(Dispatchers.Main) {
when {
!tracks.isNullOrEmpty() -> loadMedia(tracks?.toList())
playbackService.hasMedia() -> playbackService.play()
else -> playbackService.displayPlaybackError(R.string.search_no_result)
}
}
}
}
......
......@@ -246,6 +246,10 @@ class PlaybackService : MediaBrowserServiceCompat(), LifecycleOwner {
private var currentWidgetCover: String? = null
val speed: Float
@MainThread
get() = playlistManager.player.speed.value ?: 1.0F
val isPlaying: Boolean
@MainThread
get() = playlistManager.player.isPlaying()
......@@ -1061,7 +1065,6 @@ class PlaybackService : MediaBrowserServiceCompat(), LifecycleOwner {
}
private fun addCustomSpeedActions(pscb: PlaybackStateCompat.Builder, showSpeedActions: Boolean = true) {
val speed = playlistManager.player.speed.value ?: 1.0F
if (speed != 1.0F || showSpeedActions) {
val speedIcons = hashMapOf(
0.50f to R.drawable.ic_auto_speed_0_50,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment