Don't force PillarboxExoPlayer instance in Services (#890)

Author: StaehliJ

pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/service/DemoMediaLibraryService.kt

@@ -8,6 +8,7 @@ import android.app.PendingIntent
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
+import androidx.media3.common.C
 import androidx.media3.common.MediaItem
 import androidx.media3.session.LibraryResult
 import androidx.media3.session.MediaSession
@@ -35,7 +36,9 @@ class DemoMediaLibraryService : PillarboxMediaLibraryService() {
     override fun onCreate() {
         super.onCreate()
         demoBrowser = DemoBrowser()
-        val player = PlayerModule.provideDefaultPlayer(this)
+        val player = PlayerModule.provideDefaultPlayer(this).apply {
+            setWakeMode(C.WAKE_MODE_NETWORK)
+        }
         setPlayer(player = player, callback = DemoCallback(), sessionId = "AndroidAutoSession")
     }
 

pillarbox-player/src/main/java/ch/srgssr/pillarbox/player/session/PillarboxMediaLibraryService.kt

@@ -6,20 +6,18 @@ package ch.srgssr.pillarbox.player.session
 
 import android.app.PendingIntent
 import android.content.Intent
-import androidx.media3.common.C
-import androidx.media3.common.Player
 import androidx.media3.session.MediaLibraryService
 import androidx.media3.session.MediaSession
 import androidx.media3.session.MediaSession.ControllerInfo
-import ch.srgssr.pillarbox.player.PillarboxExoPlayer
+import ch.srgssr.pillarbox.player.PillarboxPlayer
 import ch.srgssr.pillarbox.player.extension.setHandleAudioFocus
 import ch.srgssr.pillarbox.player.utils.PendingIntentUtils
 
 /**
  * `PillarboxMediaLibraryService` implementation of [MediaLibraryService].
  * It is the recommended way to make background playback for Android and sharing content with Android Auto.
  *
- * It handles only one [MediaSession] with one [PillarboxExoPlayer].
+ * It handles only one [MediaSession] with one [PillarboxPlayer].
  *
  * Usage:
  * Add these permissions inside your manifest:
@@ -57,7 +55,6 @@ import ch.srgssr.pillarbox.player.utils.PendingIntentUtils
  * ```
  */
 abstract class PillarboxMediaLibraryService : MediaLibraryService() {
-    private var player: Player? = null
     private var mediaSession: PillarboxMediaLibrarySession? = null
 
     /**
@@ -67,18 +64,16 @@ abstract class PillarboxMediaLibraryService : MediaLibraryService() {
 
     /**
      * Set player to use with this Service.
-     * @param player [PillarboxExoPlayer] to link to this service.
+     * @param player [PillarboxPlayer] to link to this service.
      * @param callback The [PillarboxMediaLibrarySession.Callback]
      * @param sessionId The ID. Must be unique among all sessions per package.
      */
     fun setPlayer(
-        player: PillarboxExoPlayer,
+        player: PillarboxPlayer,
         callback: PillarboxMediaLibrarySession.Callback,
         sessionId: String? = null,
     ) {
-        if (this.player == null) {
-            this.player = player
-            player.setWakeMode(C.WAKE_MODE_NETWORK)
+        if (this.mediaSession == null) {
             player.setHandleAudioFocus(true)
             mediaSession = PillarboxMediaLibrarySession.Builder(this, player, callback).apply {
                 sessionActivity()?.let {
@@ -88,6 +83,8 @@ abstract class PillarboxMediaLibraryService : MediaLibraryService() {
                     setId(it)
                 }
             }.build()
+        } else {
+            mediaSession?.player = player
         }
     }
 

pillarbox-player/src/main/java/ch/srgssr/pillarbox/player/session/PillarboxMediaSessionService.kt

@@ -6,19 +6,17 @@ package ch.srgssr.pillarbox.player.session
 
 import android.app.PendingIntent
 import android.content.Intent
-import androidx.media3.common.C
-import androidx.media3.common.Player
 import androidx.media3.session.MediaSession
 import androidx.media3.session.MediaSessionService
-import ch.srgssr.pillarbox.player.PillarboxExoPlayer
+import ch.srgssr.pillarbox.player.PillarboxPlayer
 import ch.srgssr.pillarbox.player.extension.setHandleAudioFocus
 import ch.srgssr.pillarbox.player.utils.PendingIntentUtils
 
 /**
  * `PillarboxMediaSessionService` implementation of [MediaSessionService].
  * It is the recommended way to make background playback for Android.
  *
- * It handles only one [MediaSession] with one [PillarboxExoPlayer].
+ * It handles only one [MediaSession] with one [PillarboxPlayer].
  *
  * Usage:
  * Add these permissions inside your manifest:
@@ -53,7 +51,6 @@ import ch.srgssr.pillarbox.player.utils.PendingIntentUtils
  */
 @Suppress("MemberVisibilityCanBePrivate")
 abstract class PillarboxMediaSessionService : MediaSessionService() {
-    private var player: Player? = null
     private var mediaSession: PillarboxMediaSession? = null
 
     /**
@@ -63,18 +60,16 @@ abstract class PillarboxMediaSessionService : MediaSessionService() {
 
     /**
      * Set player to use with this Service.
-     * @param player [PillarboxExoPlayer] to link to this service.
+     * @param player [PillarboxPlayer] to link to this service.
      * @param mediaSessionCallback The [PillarboxMediaSession.Callback]
      * @param sessionId The ID. Must be unique among all sessions per package.
      */
     fun setPlayer(
-        player: PillarboxExoPlayer,
+        player: PillarboxPlayer,
         mediaSessionCallback: PillarboxMediaSession.Callback = PillarboxMediaSession.Callback.Default,
         sessionId: String? = null,
     ) {
-        if (this.player == null) {
-            this.player = player
-            player.setWakeMode(C.WAKE_MODE_NETWORK)
+        if (this.mediaSession == null) {
             player.setHandleAudioFocus(true)
             mediaSession = PillarboxMediaSession.Builder(this, player).apply {
                 sessionActivity()?.let {
@@ -85,6 +80,8 @@ abstract class PillarboxMediaSessionService : MediaSessionService() {
                     setId(it)
                 }
             }.build()
+        } else {
+            mediaSession?.player = player
         }
     }