mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-09-06 16:13:24 +00:00
Removed changes to the intent handler
This commit is contained in:
parent
d2306b0fd7
commit
cf81c37683
|
@ -635,7 +635,6 @@ public final class Player implements
|
|||
final int repeatMode = intent.getIntExtra(REPEAT_MODE, getRepeatMode());
|
||||
final boolean playWhenReady = intent.getBooleanExtra(PLAY_WHEN_READY, true);
|
||||
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):
|
||||
|
@ -692,7 +691,7 @@ public final class Player implements
|
|||
state.getProgressMillis());
|
||||
}
|
||||
initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch,
|
||||
playbackSkipSilence, playWhenReady, isMuted, shuffleMode);
|
||||
playbackSkipSilence, playWhenReady, isMuted);
|
||||
},
|
||||
error -> {
|
||||
if (DEBUG) {
|
||||
|
@ -700,19 +699,19 @@ public final class Player implements
|
|||
}
|
||||
// In case any error we can start playback without history
|
||||
initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch,
|
||||
playbackSkipSilence, playWhenReady, isMuted, shuffleMode);
|
||||
playbackSkipSilence, playWhenReady, isMuted);
|
||||
},
|
||||
() -> {
|
||||
// Completed but not found in history
|
||||
initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch,
|
||||
playbackSkipSilence, playWhenReady, isMuted, shuffleMode);
|
||||
playbackSkipSilence, playWhenReady, isMuted);
|
||||
}
|
||||
));
|
||||
} 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, repeatMode, playbackSpeed,
|
||||
playbackPitch, playbackSkipSilence, playWhenReady, isMuted, shuffleMode);
|
||||
playbackPitch, playbackSkipSilence, playWhenReady, isMuted);
|
||||
}
|
||||
|
||||
if (oldPlayerType != playerType && playQueue != null) {
|
||||
|
@ -771,12 +770,11 @@ public final class Player implements
|
|||
final float playbackPitch,
|
||||
final boolean playbackSkipSilence,
|
||||
final boolean playOnReady,
|
||||
final boolean isMuted,
|
||||
final boolean shuffleEnabled) {
|
||||
final boolean isMuted) {
|
||||
destroyPlayer();
|
||||
initPlayer(playOnReady);
|
||||
setRepeatMode(repeatMode);
|
||||
onShuffleModeEnabledChanged(shuffleEnabled);
|
||||
onShuffleModeEnabledChanged(false);
|
||||
setPlaybackParameters(playbackSpeed, playbackPitch, playbackSkipSilence);
|
||||
|
||||
playQueue = queue;
|
||||
|
|
Loading…
Reference in a new issue