Skip to content

SDK / exoplayer

Go to a project
Commit b4fc2e51 by ibaker Committed by Ian Baker
Options

Fix ForwardingPlayer @Override and @Deprecated annotations 

These were messed up in https://github.com/google/ExoPlayer/commit/74c6ef9ba096fe64e767a739b97debca5185a375

Also suppress deprecation warnings when we're just forwarding a
deprecated method to the delegate.

#minor-release

PiperOrigin-RevId: 426351791
parent 602e9f14
Inline Side-by-side
Showing with 21 additions and 2 deletions
library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java
...@@ -43,12 +43,12 @@ public class ForwardingPlayer implements Player { ...@@ -43,12 +43,12 @@ public class ForwardingPlayer implements Player {
this.player = player; this.player = player;
} }
@Deprecated @Override
public Looper getApplicationLooper() { public Looper getApplicationLooper() {
return player.getApplicationLooper(); return player.getApplicationLooper();
} }
@Deprecated @Override
public void addListener(Listener listener) { public void addListener(Listener listener) {
player.addListener(new ForwardingListener(this, listener)); player.addListener(new ForwardingListener(this, listener));
} }
...@@ -259,12 +259,14 @@ public class ForwardingPlayer implements Player { ...@@ -259,12 +259,14 @@ public class ForwardingPlayer implements Player {
player.seekForward(); player.seekForward();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public boolean hasPrevious() { public boolean hasPrevious() {
return player.hasPrevious(); return player.hasPrevious();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public boolean hasPreviousWindow() { public boolean hasPreviousWindow() {
...@@ -276,12 +278,14 @@ public class ForwardingPlayer implements Player { ...@@ -276,12 +278,14 @@ public class ForwardingPlayer implements Player {
return player.hasPreviousMediaItem(); return player.hasPreviousMediaItem();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public void previous() { public void previous() {
player.previous(); player.previous();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public void seekToPreviousWindow() { public void seekToPreviousWindow() {
...@@ -303,12 +307,14 @@ public class ForwardingPlayer implements Player { ...@@ -303,12 +307,14 @@ public class ForwardingPlayer implements Player {
return player.getMaxSeekToPreviousPosition(); return player.getMaxSeekToPreviousPosition();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public boolean hasNext() { public boolean hasNext() {
return player.hasNext(); return player.hasNext();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public boolean hasNextWindow() { public boolean hasNextWindow() {
...@@ -320,12 +326,14 @@ public class ForwardingPlayer implements Player { ...@@ -320,12 +326,14 @@ public class ForwardingPlayer implements Player {
return player.hasNextMediaItem(); return player.hasNextMediaItem();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public void next() { public void next() {
player.next(); player.next();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public void seekToNextWindow() { public void seekToNextWindow() {
...@@ -362,6 +370,7 @@ public class ForwardingPlayer implements Player { ...@@ -362,6 +370,7 @@ public class ForwardingPlayer implements Player {
player.stop(); player.stop();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public void stop(boolean reset) { public void stop(boolean reset) {
...@@ -373,11 +382,15 @@ public class ForwardingPlayer implements Player { ...@@ -373,11 +382,15 @@ public class ForwardingPlayer implements Player {
player.release(); player.release();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated
@Override @Override
public TrackGroupArray getCurrentTrackGroups() { public TrackGroupArray getCurrentTrackGroups() {
return player.getCurrentTrackGroups(); return player.getCurrentTrackGroups();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated
@Override @Override
public TrackSelectionArray getCurrentTrackSelections() { public TrackSelectionArray getCurrentTrackSelections() {
return player.getCurrentTrackSelections(); return player.getCurrentTrackSelections();
...@@ -429,6 +442,7 @@ public class ForwardingPlayer implements Player { ...@@ -429,6 +442,7 @@ public class ForwardingPlayer implements Player {
return player.getCurrentPeriodIndex(); return player.getCurrentPeriodIndex();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public int getCurrentWindowIndex() { public int getCurrentWindowIndex() {
...@@ -440,6 +454,7 @@ public class ForwardingPlayer implements Player { ...@@ -440,6 +454,7 @@ public class ForwardingPlayer implements Player {
return player.getCurrentMediaItemIndex(); return player.getCurrentMediaItemIndex();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public int getNextWindowIndex() { public int getNextWindowIndex() {
...@@ -451,6 +466,7 @@ public class ForwardingPlayer implements Player { ...@@ -451,6 +466,7 @@ public class ForwardingPlayer implements Player {
return player.getNextMediaItemIndex(); return player.getNextMediaItemIndex();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public int getPreviousWindowIndex() { public int getPreviousWindowIndex() {
...@@ -503,6 +519,7 @@ public class ForwardingPlayer implements Player { ...@@ -503,6 +519,7 @@ public class ForwardingPlayer implements Player {
return player.getTotalBufferedDuration(); return player.getTotalBufferedDuration();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public boolean isCurrentWindowDynamic() { public boolean isCurrentWindowDynamic() {
...@@ -514,6 +531,7 @@ public class ForwardingPlayer implements Player { ...@@ -514,6 +531,7 @@ public class ForwardingPlayer implements Player {
return player.isCurrentMediaItemDynamic(); return player.isCurrentMediaItemDynamic();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public boolean isCurrentWindowLive() { public boolean isCurrentWindowLive() {
...@@ -530,6 +548,7 @@ public class ForwardingPlayer implements Player { ...@@ -530,6 +548,7 @@ public class ForwardingPlayer implements Player {
return player.getCurrentLiveOffset(); return player.getCurrentLiveOffset();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public boolean isCurrentWindowSeekable() { public boolean isCurrentWindowSeekable() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment