Merge pull request #5635 from Bnyro/master

refactor: don't recreate player on orientation change
libre-tube · Feb 18, 2024 · aadf5bf · aadf5bf
2 parents 206479c + 0a4ccae
commit aadf5bf
Show file tree

Hide file tree

Showing 5 changed files with 212 additions and 145 deletions.
diff --git a/app/src/main/java/com/github/libretube/services/OfflinePlayerService.kt b/app/src/main/java/com/github/libretube/services/OfflinePlayerService.kt
@@ -146,8 +146,10 @@ class OfflinePlayerService : LifecycleService() {
     }
 
     override fun onDestroy() {
-        nowPlayingNotification?.destroySelfAndPlayer()
+        nowPlayingNotification?.destroySelf()
 
+        player?.stop()
+        player?.release()
         player = null
         nowPlayingNotification = null
 

diff --git a/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt b/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt
@@ -387,7 +387,10 @@ class OnlinePlayerService : LifecycleService() {
         // reset the playing queue
         PlayingQueue.resetToDefaults()
 
-        if (this::nowPlayingNotification.isInitialized) nowPlayingNotification.destroySelfAndPlayer()
+        if (this::nowPlayingNotification.isInitialized) nowPlayingNotification.destroySelf()
+
+        player?.stop()
+        player?.release()
 
         // called when the user pressed stop in the notification
         // stop the service from being in the foreground and remove the notification