Remove BasePlayer stop as a final method.

It calls through to a deprecated method, which is unusual for a
convenience method, and the deprecated method has various
implementations. This allows for a smoother removal of stop(boolean)
and removes an obstacle for the ExoPlayer-SimpleExoPlayer merge.

Adds missing @Deprecated tags to some Players.

PiperOrigin-RevId: 400213422
This commit is contained in:
samrobinson 2021-10-01 16:57:46 +01:00 committed by bachinger
parent c810309775
commit a26caae4ca
5 changed files with 23 additions and 5 deletions

View File

@ -493,6 +493,12 @@ public final class CastPlayer extends BasePlayer {
return playbackParameters.value;
}
@Override
public void stop() {
stop(/* reset= */ false);
}
@Deprecated
@Override
public void stop(boolean reset) {
playbackState = STATE_IDLE;

View File

@ -227,11 +227,6 @@ public abstract class BasePlayer implements Player {
setPlaybackParameters(getPlaybackParameters().withSpeed(speed));
}
@Override
public final void stop() {
stop(/* reset= */ false);
}
@Override
public final int getNextWindowIndex() {
Timeline timeline = getCurrentTimeline();

View File

@ -738,6 +738,12 @@ import java.util.concurrent.CopyOnWriteArraySet;
}
}
@Override
public void stop() {
stop(/* reset= */ false);
}
@Deprecated
@Override
public void stop(boolean reset) {
stop(reset, /* error= */ null);

View File

@ -1378,6 +1378,11 @@ public class SimpleExoPlayer extends BasePlayer
player.setForegroundMode(foregroundMode);
}
@Override
public void stop() {
stop(/* reset= */ false);
}
@Deprecated
@Override
public void stop(boolean reset) {

View File

@ -416,6 +416,12 @@ public class StubExoPlayer extends BasePlayer implements ExoPlayer {
throw new UnsupportedOperationException();
}
@Override
public void stop() {
throw new UnsupportedOperationException();
}
@Deprecated
@Override
public void stop(boolean reset) {
throw new UnsupportedOperationException();