dev: refactor playbackmode

Author: InfinityLoop1308

android/src/main/kotlin/project/pipepipe/app/MainActivity.kt

@@ -511,7 +511,7 @@ class MainActivity : ComponentActivity() {
             when (minimizeSetting) {
                 "minimize_on_exit_background_key" -> {
                     // Minimize to background player
-                    SharedContext.platformMediaController?.setPlaybackMode(PlaybackMode.AUDIO_ONLY)
+                    SharedContext.updatePlaybackMode(PlaybackMode.AUDIO_ONLY)
                 }
 
                 "minimize_on_exit_popup_key" -> {

android/src/main/kotlin/project/pipepipe/app/platform/AndroidActions.kt

@@ -70,7 +70,7 @@ class AndroidActions(
         MainScope().launch {
             SharedContext.sharedVideoDetailViewModel.loadVideoDetails(streamInfo.url, streamInfo.serviceId)
             SharedContext.enterPipmode()
-            SharedContext.platformMediaController?.setPlaybackMode(PlaybackMode.VIDEO_AUDIO)
+            SharedContext.updatePlaybackMode(PlaybackMode.VIDEO_AUDIO)
             SharedContext.platformMediaController?.playFromStreamInfo(streamInfo)
             SharedContext.sharedVideoDetailViewModel.showAsFullscreenPlayer()
             activity.enterPipMode(streamInfo.isPortrait)

android/src/main/kotlin/project/pipepipe/app/platform/AndroidMediaController.kt

@@ -285,11 +285,16 @@ class AndroidMediaController(
 
     // ===== Business Operations =====
 
-    override fun setPlaybackMode(mode: PlaybackMode) {
-        mediaController.sendCustomCommand(
-            PlaybackService.CustomCommands.buildSetPlaybackModeCommand(mode),
-            Bundle.EMPTY
-        )
+    override fun applyPlaybackMode(mode: PlaybackMode) {
+        val disableVideo = (mode == PlaybackMode.AUDIO_ONLY)
+        val params = mediaController.trackSelectionParameters
+            .buildUpon()
+            .setTrackTypeDisabled(C.TRACK_TYPE_VIDEO, disableVideo)
+            .build()
+        mediaController.trackSelectionParameters = params
+        if (!disableVideo && mediaController.currentMediaItem != null && mediaController.isPlaying) {
+            mediaController.seekTo(mediaController.currentMediaItemIndex, mediaController.currentPosition)
+        }
     }
 
     override fun setPlaybackParameters(speed: Float, pitch: Float) {

android/src/main/kotlin/project/pipepipe/app/service/PlaybackService.kt

@@ -125,18 +125,11 @@ class PlaybackService : MediaLibraryService() {
     }
 
     object CustomCommands {
-        const val ACTION_SET_PLAYBACK_MODE = "project.pipepipe.app.action.SET_PLAYBACK_MODE"
         const val ARG_MODE = "mode"
-
         const val ACTION_STOP_SERVICE = "project.pipepipe.app.action.STOP_SERVICE"
         val STOP_SERVICE_COMMAND = SessionCommand(ACTION_STOP_SERVICE, Bundle.EMPTY)
         const val ACTION_CHANGE_REPEAT_MODE = "project.pipepipe.app.action.CHANGE_REPEAT_MODE"
         val CHANGE_REPEAT_MODE_COMMAND = SessionCommand(ACTION_CHANGE_REPEAT_MODE, Bundle.EMPTY)
-
-        fun buildSetPlaybackModeCommand(mode: PlaybackMode): SessionCommand {
-            val args = Bundle().apply { putString(ARG_MODE, mode.name) }
-            return SessionCommand(ACTION_SET_PLAYBACK_MODE, args)
-        }
     }
 
     override fun onCreate() {
@@ -231,7 +224,6 @@ class PlaybackService : MediaLibraryService() {
             ): MediaSession.ConnectionResult {
                 // Use DEFAULT_SESSION_AND_LIBRARY_COMMANDS to allow library browsing (Android Auto)
                 val availableSessionCommands = MediaSession.ConnectionResult.DEFAULT_SESSION_AND_LIBRARY_COMMANDS.buildUpon()
-                    .add(SessionCommand(CustomCommands.ACTION_SET_PLAYBACK_MODE, Bundle.EMPTY))
                     .add(CustomCommands.STOP_SERVICE_COMMAND)
                     .add(CustomCommands.CHANGE_REPEAT_MODE_COMMAND)
                     .build()
@@ -428,14 +420,6 @@ class PlaybackService : MediaLibraryService() {
             .setMediaButtonPreferences(mediaButtonPreferences)
             .build()
 
-        applyPlaybackMode(playbackMode.value)
-
-        // Monitor playbackMode changes
-        serviceScope.launch {
-            playbackMode.collect { mode ->
-                applyPlaybackMode(mode)
-            }
-        }
 
         // Monitor skip silence setting changes
         skipSilenceListener = SharedContext.settingsManager.addBooleanListener(
@@ -525,17 +509,6 @@ class PlaybackService : MediaLibraryService() {
         args: Bundle
     ): SessionResult {
         return when (command.customAction) {
-            CustomCommands.ACTION_SET_PLAYBACK_MODE -> {
-                val modeName = command.customExtras.getString(CustomCommands.ARG_MODE)
-                val mode = runCatching { PlaybackMode.valueOf(modeName ?: "") }.getOrNull()
-                if (mode != null) {
-                    SharedContext.updatePlaybackMode(mode)
-                    // applyPlaybackMode will be called automatically by the Flow collector
-                    SessionResult(SessionResult.RESULT_SUCCESS)
-                } else {
-                    SessionResult(SessionError.ERROR_BAD_VALUE)
-                }
-            }
             CustomCommands.ACTION_STOP_SERVICE -> {
                 saveCurrentProgress()
                 player.stop()
@@ -588,22 +561,7 @@ class PlaybackService : MediaLibraryService() {
         }
     }
 
-    private fun applyPlaybackMode(mode: PlaybackMode) {
-        val disableVideo = (mode == PlaybackMode.AUDIO_ONLY)
-        if (disableVideo && SharedContext.sharedVideoDetailViewModel.uiState.value.pageState == VideoDetailPageState.FULLSCREEN_PLAYER) {
-            // for unknown reason, sometimes switching from detail page -> fullscreen will cause video track disabled but playback mode still video_audio
-            // hopefully this check should prevent it.
-            return
-        }
-        val params = player.trackSelectionParameters
-            .buildUpon()
-            .setTrackTypeDisabled(C.TRACK_TYPE_VIDEO, disableVideo)
-            .build()
-        player.trackSelectionParameters = params
-        if (!disableVideo && player.currentMediaItem != null && player.isPlaying) {
-            player.seekTo(player.currentMediaItemIndex, player.currentPosition)
-        }
-    }
+
 
     private fun buildSessionActivity(): PendingIntent {
         val intent = Intent(this, Class.forName("project.pipepipe.app.MainActivity"))

library/src/commonMain/kotlin/project/pipepipe/app/SharedContext.kt

@@ -3,12 +3,15 @@ package project.pipepipe.app
 import androidx.navigation.NavHostController
 import com.fasterxml.jackson.databind.ObjectMapper
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
 import project.pipepipe.database.AppDatabase
@@ -69,7 +72,12 @@ object SharedContext {
     val playbackMode: StateFlow<PlaybackMode> = _playbackMode.asStateFlow()
 
     fun updatePlaybackMode(mode: PlaybackMode) {
-        _playbackMode.value = mode
+        runBlocking {
+            MainScope().launch {
+                platformMediaController!!.applyPlaybackMode(mode)
+                _playbackMode.value = mode
+            }
+        }
     }
 
     private val _playQueueVisibility = MutableStateFlow(false)

library/src/commonMain/kotlin/project/pipepipe/app/platform/PlatformMediaController.kt

@@ -123,7 +123,7 @@ interface PlatformMediaController {
 
     fun release()
 
-    fun setPlaybackMode(mode: PlaybackMode)
+    fun applyPlaybackMode(mode: PlaybackMode)
 
     fun playFromStreamInfo(streamInfo: StreamInfo)
 
@@ -133,7 +133,7 @@ interface PlatformMediaController {
     }
 
     fun backgroundPlay(streamInfo: StreamInfo) {
-        setPlaybackMode(PlaybackMode.AUDIO_ONLY)
+        SharedContext.updatePlaybackMode(PlaybackMode.AUDIO_ONLY)
         playFromStreamInfo(streamInfo)
     }
 
@@ -149,7 +149,7 @@ interface PlatformMediaController {
 
     fun playAll(items: List<StreamInfo>, startIndex: Int, shuffle: Boolean) {
         MainScope().launch {
-            setPlaybackMode(PlaybackMode.AUDIO_ONLY)
+            SharedContext.updatePlaybackMode(PlaybackMode.AUDIO_ONLY)
             // Save items to database
             GlobalScope.launch {
                 items.forEach { item ->

library/src/commonMain/kotlin/project/pipepipe/app/ui/component/player/VideoPlayer.kt

@@ -421,7 +421,7 @@ fun VideoPlayer(
                 modifier = Modifier
                     .fillMaxSize()
                     .clickable {
-                        mediaController.setPlaybackMode(PlaybackMode.VIDEO_AUDIO)
+                        SharedContext.updatePlaybackMode(PlaybackMode.VIDEO_AUDIO)
                         mediaController.playFromStreamInfo(streamInfo)
                         if (SharedContext.settingsManager.getBoolean("start_main_player_fullscreen_key")) {
                             SharedContext.sharedVideoDetailViewModel.toggleFullscreenPlayer()

library/src/commonMain/kotlin/project/pipepipe/app/ui/screens/videodetail/VideoDetailScreen.kt

@@ -141,7 +141,7 @@ fun VideoDetailScreen(modifier: Modifier, navController: NavHostController) {
                 // Resume video playback
                 kotlinx.coroutines.delay(500) // don't use a small value, this will interfere the animation
                 controller?.let {
-                    controller.setPlaybackMode(PlaybackMode.VIDEO_AUDIO)
+                    SharedContext.updatePlaybackMode(PlaybackMode.VIDEO_AUDIO)
                     if (controller.currentMediaItem.value?.mediaId == streamInfo.url && controller.isPlaying.value) {
                         controller.playFromStreamInfo(streamInfo)
                     }
@@ -159,7 +159,7 @@ fun VideoDetailScreen(modifier: Modifier, navController: NavHostController) {
 
                 if (shouldAutoPlay) {
                     controller?.let {
-                        controller.setPlaybackMode(PlaybackMode.VIDEO_AUDIO)
+                        SharedContext.updatePlaybackMode(PlaybackMode.VIDEO_AUDIO)
                         if (controller.currentMediaItem.value?.mediaId != streamInfo.url) {
                             controller.playFromStreamInfo(streamInfo)
                         } else if (!controller.isPlaying.value) {
@@ -538,7 +538,7 @@ fun VideoDetailScreen(modifier: Modifier, navController: NavHostController) {
                                 item {
                                     ActionButtons(
                                         onPlayAudioClick = {
-                                            controller.setPlaybackMode(PlaybackMode.AUDIO_ONLY)
+                                            SharedContext.updatePlaybackMode(PlaybackMode.AUDIO_ONLY)
                                             if (controller.currentMediaItem.value?.mediaId != streamInfo.url) {
                                                 controller.playFromStreamInfo(streamInfo)
                                             } else if (!controller.isPlaying.value) {