@@ -359,7 +359,6 @@ public void handleIntent(@NonNull final Intent intent) {
359359 final PlayerType oldPlayerType = playerType ;
360360 playerType = PlayerType .retrieveFromIntent (intent );
361361 initUIsForCurrentPlayerType ();
362- // We need to setup audioOnly before super(), see "sourceOf"
363362 isAudioOnly = audioPlayerSelected ();
364363
365364 if (intent .hasExtra (PLAYBACK_QUALITY )) {
@@ -371,24 +370,26 @@ public void handleIntent(@NonNull final Intent intent) {
371370 playQueue .append (newQueue .getStreams ());
372371 return ;
373372
374- // Resolve enqueue next intents
373+ // Resolve enqueue next intents
375374 } else if (intent .getBooleanExtra (ENQUEUE_NEXT , false ) && playQueue != null ) {
376375 final int currentIndex = playQueue .getIndex ();
377376 playQueue .append (newQueue .getStreams ());
378377 playQueue .move (playQueue .size () - 1 , currentIndex + 1 );
379378 return ;
380379 }
381380
381+ // initPlayback Parameters
382382 final PlaybackParameters savedParameters = retrievePlaybackParametersFromPrefs (this );
383383 final float playbackSpeed = savedParameters .speed ;
384384 final float playbackPitch = savedParameters .pitch ;
385385 final boolean playbackSkipSilence = getPrefs ().getBoolean (getContext ().getString (
386386 R .string .playback_skip_silence_key ), getPlaybackSkipSilence ());
387-
388- final boolean samePlayQueue = playQueue != null && playQueue .equalStreamsAndIndex (newQueue );
389387 final int repeatMode = intent .getIntExtra (REPEAT_MODE , getRepeatMode ());
390388 final boolean playWhenReady = intent .getBooleanExtra (PLAY_WHEN_READY , true );
391389
390+ // branching parameters for below
391+ final boolean samePlayQueue = playQueue != null && playQueue .equalStreamsAndIndex (newQueue );
392+
392393 /*
393394 * TODO As seen in #7427 this does not work:
394395 * There are 3 situations when playback shouldn't be started from scratch (zero timestamp):
0 commit comments