From c4a8d22760aca0c9e9006045ec8fb57d2123599d Mon Sep 17 00:00:00 2001 From: vfsfitvnm Date: Fri, 1 Jul 2022 18:33:40 +0200 Subject: [PATCH] Stop radio before setting up a new one --- .../it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt | 2 ++ .../it/vfsfitvnm/vimusic/ui/screens/SearchResultScreen.kt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt index 0fd08b0..0e3462c 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt @@ -137,6 +137,7 @@ fun NonQueuedMediaItemMenu( mediaItem = mediaItem, onDismiss = onDismiss ?: menuState::hide, onStartRadio = { + binder?.stopRadio() binder?.player?.forcePlay(mediaItem) binder?.setupRadio( NavigationEndpoint.Endpoint.Watch( @@ -146,6 +147,7 @@ fun NonQueuedMediaItemMenu( ) }, onPlaySingle = { + binder?.stopRadio() binder?.player?.forcePlay(mediaItem) }, onPlayNext = { diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SearchResultScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SearchResultScreen.kt index a4cf952..e2138db 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SearchResultScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SearchResultScreen.kt @@ -223,10 +223,12 @@ fun SearchResultScreen( is YouTube.Item.Artist -> artistRoute(item.info.endpoint!!.browseId) is YouTube.Item.Playlist -> playlistRoute(item.info.endpoint!!.browseId) is YouTube.Item.Song -> { + binder?.stopRadio() binder?.player?.forcePlay(item.asMediaItem) binder?.setupRadio(item.info.endpoint) } is YouTube.Item.Video -> { + binder?.stopRadio() binder?.player?.forcePlay(item.asMediaItem) binder?.setupRadio(item.info.endpoint) }