Skip to content

Commit d4a47ff

Browse files
committed
Player: Remove unused IS_MUTED intent key
The only use of the key was removed in commit 2a2c82e but the handling logic stayed around. So let’s get rid of it.
1 parent a3ddd61 commit d4a47ff

1 file changed

Lines changed: 6 additions & 9 deletions

File tree

app/src/main/java/org/schabi/newpipe/player/Player.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ public final class Player implements PlaybackListener, Listener {
162162
public static final String RESUME_PLAYBACK = "resume_playback";
163163
public static final String PLAY_WHEN_READY = "play_when_ready";
164164
public static final String PLAYER_TYPE = "player_type";
165-
public static final String IS_MUTED = "is_muted";
166165

167166
/*//////////////////////////////////////////////////////////////////////////
168167
// Time constants
@@ -389,7 +388,6 @@ public void handleIntent(@NonNull final Intent intent) {
389388
final boolean samePlayQueue = playQueue != null && playQueue.equalStreamsAndIndex(newQueue);
390389
final int repeatMode = intent.getIntExtra(REPEAT_MODE, getRepeatMode());
391390
final boolean playWhenReady = intent.getBooleanExtra(PLAY_WHEN_READY, true);
392-
final boolean isMuted = intent.getBooleanExtra(IS_MUTED, isMuted());
393391

394392
/*
395393
* TODO As seen in #7427 this does not work:
@@ -447,27 +445,27 @@ public void handleIntent(@NonNull final Intent intent) {
447445
state.getProgressMillis());
448446
}
449447
initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch,
450-
playbackSkipSilence, playWhenReady, isMuted);
448+
playbackSkipSilence, playWhenReady);
451449
},
452450
error -> {
453451
if (DEBUG) {
454452
Log.w(TAG, "Failed to start playback", error);
455453
}
456454
// In case any error we can start playback without history
457455
initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch,
458-
playbackSkipSilence, playWhenReady, isMuted);
456+
playbackSkipSilence, playWhenReady);
459457
},
460458
() -> {
461459
// Completed but not found in history
462460
initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch,
463-
playbackSkipSilence, playWhenReady, isMuted);
461+
playbackSkipSilence, playWhenReady);
464462
}
465463
));
466464
} else {
467465
// Good to go...
468466
// In a case of equal PlayQueues we can re-init old one but only when it is disposed
469467
initPlayback(samePlayQueue ? playQueue : newQueue, repeatMode, playbackSpeed,
470-
playbackPitch, playbackSkipSilence, playWhenReady, isMuted);
468+
playbackPitch, playbackSkipSilence, playWhenReady);
471469
}
472470

473471
if (oldPlayerType != playerType && playQueue != null) {
@@ -517,8 +515,7 @@ private void initPlayback(@NonNull final PlayQueue queue,
517515
final float playbackSpeed,
518516
final float playbackPitch,
519517
final boolean playbackSkipSilence,
520-
final boolean playOnReady,
521-
final boolean isMuted) {
518+
final boolean playOnReady) {
522519
destroyPlayer();
523520
initPlayer(playOnReady);
524521
setRepeatMode(repeatMode);
@@ -530,7 +527,7 @@ private void initPlayback(@NonNull final PlayQueue queue,
530527

531528
UIs.call(PlayerUi::initPlayback);
532529

533-
simpleExoPlayer.setVolume(isMuted ? 0 : 1);
530+
simpleExoPlayer.setVolume(isMuted() ? 0 : 1);
534531
notifyQueueUpdateToListeners();
535532
}
536533

0 commit comments

Comments
 (0)