be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed changes to the intent handler

This commit is contained in:
0x416c6578 2021-08-04 17:21:50 +01:00 committed by litetex
parent d2306b0fd7
commit cf81c37683
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -635,7 +635,6 @@ public final class Player implements
final int repeatMode = intent.getIntExtra(REPEAT_MODE, getRepeatMode()); final int repeatMode = intent.getIntExtra(REPEAT_MODE, getRepeatMode());
final boolean playWhenReady = intent.getBooleanExtra(PLAY_WHEN_READY, true); final boolean playWhenReady = intent.getBooleanExtra(PLAY_WHEN_READY, true);
final boolean isMuted = intent.getBooleanExtra(IS_MUTED, isMuted()); final boolean isMuted = intent.getBooleanExtra(IS_MUTED, isMuted());
final boolean shuffleMode = false; //Set the default shuffle mode to disabled
/* /*
* There are 3 situations when playback shouldn't be started from scratch (zero timestamp): * There are 3 situations when playback shouldn't be started from scratch (zero timestamp):
@ -692,7 +691,7 @@ public final class Player implements
state.getProgressMillis()); state.getProgressMillis());
} }
initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch, initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch,
playbackSkipSilence, playWhenReady, isMuted, shuffleMode); playbackSkipSilence, playWhenReady, isMuted);
}, },
error -> { error -> {
if (DEBUG) { if (DEBUG) {
@ -700,19 +699,19 @@ public final class Player implements
} }
// In case any error we can start playback without history // In case any error we can start playback without history
initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch, initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch,
playbackSkipSilence, playWhenReady, isMuted, shuffleMode); playbackSkipSilence, playWhenReady, isMuted);
}, },
() -> { () -> {
// Completed but not found in history // Completed but not found in history
initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch, initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch,
playbackSkipSilence, playWhenReady, isMuted, shuffleMode); playbackSkipSilence, playWhenReady, isMuted);
} }
)); ));
} 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, repeatMode, playbackSpeed, initPlayback(samePlayQueue ? playQueue : newQueue, repeatMode, playbackSpeed,
playbackPitch, playbackSkipSilence, playWhenReady, isMuted, shuffleMode); playbackPitch, playbackSkipSilence, playWhenReady, isMuted);
} }
if (oldPlayerType != playerType && playQueue != null) { if (oldPlayerType != playerType && playQueue != null) {
@ -771,12 +770,11 @@ public final class Player implements
final float playbackPitch, final float playbackPitch,
final boolean playbackSkipSilence, final boolean playbackSkipSilence,
final boolean playOnReady, final boolean playOnReady,
final boolean isMuted, final boolean isMuted) {
final boolean shuffleEnabled) {
destroyPlayer(); destroyPlayer();
initPlayer(playOnReady); initPlayer(playOnReady);
setRepeatMode(repeatMode); setRepeatMode(repeatMode);
onShuffleModeEnabledChanged(shuffleEnabled); onShuffleModeEnabledChanged(false);
setPlaybackParameters(playbackSpeed, playbackPitch, playbackSkipSilence); setPlaybackParameters(playbackSpeed, playbackPitch, playbackSkipSilence);
playQueue = queue; playQueue = queue;