mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-07-03 18:42:59 +00:00
Code Issues Releases Wiki Activity

Player/handleIntent: move prefs parameters into initPlayback

Browse Source 
They are just read from the player preferences and don’t influence the
branching, no need to read them in the intent parsing logic.
This commit is contained in:
Profpatsch 2025-05-05 15:48:26 +02:00
parent 95adc8863b
commit 1e4d1368cb
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/org/schabi/newpipe/player/Player.java
View File

@ -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); final boolean playWhenReady = intent.getBooleanExtra(PLAY_WHEN_READY, true);
// branching parameters for below // branching parameters for below
@ -454,28 +448,24 @@ public final class Player implements PlaybackListener, Listener {
newQueue.setRecovery(newQueue.getIndex(), newQueue.setRecovery(newQueue.getIndex(),
state.getProgressMillis()); state.getProgressMillis());
} }
initPlayback(newQueue, playbackSpeed, playbackPitch, initPlayback(newQueue, playWhenReady);
playbackSkipSilence, playWhenReady);
}, },
error -> { error -> {
if (DEBUG) { if (DEBUG) {
Log.w(TAG, "Failed to start playback", error); Log.w(TAG, "Failed to start playback", error);
} }
// In case any error we can start playback without history // In case any error we can start playback without history
initPlayback(newQueue, playbackSpeed, playbackPitch, initPlayback(newQueue, playWhenReady);
playbackSkipSilence, playWhenReady);
}, },
() -> { () -> {
// Completed but not found in history // Completed but not found in history
initPlayback(newQueue, playbackSpeed, playbackPitch, initPlayback(newQueue, playWhenReady);
playbackSkipSilence, playWhenReady);
} }
)); ));
} else { } else {
// Good to go... // Good to go...
// In a case of equal PlayQueues we can re-init old one but only when it is disposed // In a case of equal PlayQueues we can re-init old one but only when it is disposed
initPlayback(samePlayQueue ? playQueue : newQueue, playbackSpeed, initPlayback(samePlayQueue ? playQueue : newQueue, playWhenReady);
playbackPitch, playbackSkipSilence, playWhenReady);
} }
if (oldPlayerType != playerType && playQueue != null) { if (oldPlayerType != playerType && playQueue != null) {
@ -521,13 +511,13 @@ public final class Player implements PlaybackListener, Listener {
} }
private void initPlayback(@NonNull final PlayQueue queue, private void initPlayback(@NonNull final PlayQueue queue,
final float playbackSpeed,
final float playbackPitch,
final boolean playbackSkipSilence,
final boolean playOnReady) { final boolean playOnReady) {
destroyPlayer(); destroyPlayer();
initPlayer(playOnReady); 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 = queue;
playQueue.init(); playQueue.init();