From 1e4d1368cbd995230fff36f94c4821bdd3e1cf82 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 5 May 2025 15:48:26 +0200
Subject: [PATCH] Player/handleIntent: move prefs parameters into initPlayback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

They are just read from the player preferences and don’t influence the
branching, no need to read them in the intent parsing logic.
---
 .../org/schabi/newpipe/player/Player.java     | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index 02d0d4300..e3034e0cf 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -387,12 +387,6 @@ public final class Player implements PlaybackListener, Listener {
             }
         }
 
-        // initPlayback Parameters
-        final PlaybackParameters savedParameters = retrievePlaybackParametersFromPrefs(this);
-        final float playbackSpeed = savedParameters.speed;
-        final float playbackPitch = savedParameters.pitch;
-        final boolean playbackSkipSilence = getPrefs().getBoolean(getContext().getString(
-                R.string.playback_skip_silence_key), getPlaybackSkipSilence());
         final boolean playWhenReady = intent.getBooleanExtra(PLAY_WHEN_READY, true);
 
         // branching parameters for below
@@ -454,28 +448,24 @@ public final class Player implements PlaybackListener, Listener {
                                     newQueue.setRecovery(newQueue.getIndex(),
                                             state.getProgressMillis());
                                 }
-                                initPlayback(newQueue, playbackSpeed, playbackPitch,
-                                        playbackSkipSilence, playWhenReady);
+                                initPlayback(newQueue, playWhenReady);
                             },
                             error -> {
                                 if (DEBUG) {
                                     Log.w(TAG, "Failed to start playback", error);
                                 }
                                 // In case any error we can start playback without history
-                                initPlayback(newQueue, playbackSpeed, playbackPitch,
-                                        playbackSkipSilence, playWhenReady);
+                                initPlayback(newQueue, playWhenReady);
                             },
                             () -> {
                                 // Completed but not found in history
-                                initPlayback(newQueue, playbackSpeed, playbackPitch,
-                                        playbackSkipSilence, playWhenReady);
+                                initPlayback(newQueue, playWhenReady);
                             }
                     ));
         } else {
             // Good to go...
             // In a case of equal PlayQueues we can re-init old one but only when it is disposed
-            initPlayback(samePlayQueue ? playQueue : newQueue, playbackSpeed,
-                    playbackPitch, playbackSkipSilence, playWhenReady);
+            initPlayback(samePlayQueue ? playQueue : newQueue, playWhenReady);
         }
 
         if (oldPlayerType != playerType && playQueue != null) {
@@ -521,13 +511,13 @@ public final class Player implements PlaybackListener, Listener {
     }
 
     private void initPlayback(@NonNull final PlayQueue queue,
-                              final float playbackSpeed,
-                              final float playbackPitch,
-                              final boolean playbackSkipSilence,
                               final boolean playOnReady) {
         destroyPlayer();
         initPlayer(playOnReady);
-        setPlaybackParameters(playbackSpeed, playbackPitch, playbackSkipSilence);
+        final boolean playbackSkipSilence = getPrefs().getBoolean(getContext().getString(
+                R.string.playback_skip_silence_key), getPlaybackSkipSilence());
+        final PlaybackParameters savedParameters = retrievePlaybackParametersFromPrefs(this);
+        setPlaybackParameters(savedParameters.speed, savedParameters.pitch, playbackSkipSilence);
 
         playQueue = queue;
         playQueue.init();