Skip to content

SDK / exoplayer

Go to a project
Commit 520f77be by gyumin Committed by Oliver Woodman
Options

Mark convenience methods as final in BasePlayer 

PiperOrigin-RevId: 359021944
parent 45b0c981
Inline Side-by-side
Showing with 10 additions and 102 deletions
library/common/src/main/java/com/google/android/exoplayer2/BasePlayer.java
...@@ -30,44 +30,44 @@ public abstract class BasePlayer implements Player { ...@@ -30,44 +30,44 @@ public abstract class BasePlayer implements Player {
} }
@Override @Override
public void setMediaItem(MediaItem mediaItem) { public final void setMediaItem(MediaItem mediaItem) {
setMediaItems(Collections.singletonList(mediaItem)); setMediaItems(Collections.singletonList(mediaItem));
} }
@Override @Override
public void setMediaItem(MediaItem mediaItem, long startPositionMs) { public final void setMediaItem(MediaItem mediaItem, long startPositionMs) {
setMediaItems(Collections.singletonList(mediaItem), /* startWindowIndex= */ 0, startPositionMs); setMediaItems(Collections.singletonList(mediaItem), /* startWindowIndex= */ 0, startPositionMs);
} }
@Override @Override
public void setMediaItem(MediaItem mediaItem, boolean resetPosition) { public final void setMediaItem(MediaItem mediaItem, boolean resetPosition) {
setMediaItems(Collections.singletonList(mediaItem), resetPosition); setMediaItems(Collections.singletonList(mediaItem), resetPosition);
} }
@Override @Override
public void setMediaItems(List<MediaItem> mediaItems) { public final void setMediaItems(List<MediaItem> mediaItems) {
setMediaItems(mediaItems, /* resetPosition= */ true); setMediaItems(mediaItems, /* resetPosition= */ true);
} }
@Override @Override
public void addMediaItem(int index, MediaItem mediaItem) { public final void addMediaItem(int index, MediaItem mediaItem) {
addMediaItems(index, Collections.singletonList(mediaItem)); addMediaItems(index, Collections.singletonList(mediaItem));
} }
@Override @Override
public void addMediaItem(MediaItem mediaItem) { public final void addMediaItem(MediaItem mediaItem) {
addMediaItems(Collections.singletonList(mediaItem)); addMediaItems(Collections.singletonList(mediaItem));
} }
@Override @Override
public void moveMediaItem(int currentIndex, int newIndex) { public final void moveMediaItem(int currentIndex, int newIndex) {
if (currentIndex != newIndex) { if (currentIndex != newIndex) {
moveMediaItems(/* fromIndex= */ currentIndex, /* toIndex= */ currentIndex + 1, newIndex); moveMediaItems(/* fromIndex= */ currentIndex, /* toIndex= */ currentIndex + 1, newIndex);
} }
} }
@Override @Override
public void removeMediaItem(int index) { public final void removeMediaItem(int index) {
removeMediaItems(/* fromIndex= */ index, /* toIndex= */ index + 1); removeMediaItems(/* fromIndex= */ index, /* toIndex= */ index + 1);
} }
...@@ -188,12 +188,12 @@ public abstract class BasePlayer implements Player { ...@@ -188,12 +188,12 @@ public abstract class BasePlayer implements Player {
} }
@Override @Override
public int getMediaItemCount() { public final int getMediaItemCount() {
return getCurrentTimeline().getWindowCount(); return getCurrentTimeline().getWindowCount();
} }
@Override @Override
public MediaItem getMediaItemAt(int index) { public final MediaItem getMediaItemAt(int index) {
return getCurrentTimeline().getWindow(index, window).mediaItem; return getCurrentTimeline().getWindow(index, window).mediaItem;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
...@@ -1294,13 +1294,6 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -1294,13 +1294,6 @@ public class SimpleExoPlayer extends BasePlayer
} }
@Override @Override
public void setMediaItems(List<MediaItem> mediaItems) {
verifyApplicationThread();
analyticsCollector.resetForNewPlaylist();
player.setMediaItems(mediaItems);
}
@Override
public void setMediaItems(List<MediaItem> mediaItems, boolean resetPosition) { public void setMediaItems(List<MediaItem> mediaItems, boolean resetPosition) {
verifyApplicationThread(); verifyApplicationThread();
analyticsCollector.resetForNewPlaylist(); analyticsCollector.resetForNewPlaylist();
...@@ -1316,27 +1309,6 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -1316,27 +1309,6 @@ public class SimpleExoPlayer extends BasePlayer
} }
@Override @Override
public void setMediaItem(MediaItem mediaItem) {
verifyApplicationThread();
analyticsCollector.resetForNewPlaylist();
player.setMediaItem(mediaItem);
}
@Override
public void setMediaItem(MediaItem mediaItem, boolean resetPosition) {
verifyApplicationThread();
analyticsCollector.resetForNewPlaylist();
player.setMediaItem(mediaItem, resetPosition);
}
@Override
public void setMediaItem(MediaItem mediaItem, long startPositionMs) {
verifyApplicationThread();
analyticsCollector.resetForNewPlaylist();
player.setMediaItem(mediaItem, startPositionMs);
}
@Override
public void setMediaSources(List<MediaSource> mediaSources) { public void setMediaSources(List<MediaSource> mediaSources) {
verifyApplicationThread(); verifyApplicationThread();
analyticsCollector.resetForNewPlaylist(); analyticsCollector.resetForNewPlaylist();
...@@ -1392,18 +1364,6 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -1392,18 +1364,6 @@ public class SimpleExoPlayer extends BasePlayer
} }
@Override @Override
public void addMediaItem(MediaItem mediaItem) {
verifyApplicationThread();
player.addMediaItem(mediaItem);
}
@Override
public void addMediaItem(int index, MediaItem mediaItem) {
verifyApplicationThread();
player.addMediaItem(index, mediaItem);
}
@Override
public void addMediaSource(MediaSource mediaSource) { public void addMediaSource(MediaSource mediaSource) {
verifyApplicationThread(); verifyApplicationThread();
player.addMediaSource(mediaSource); player.addMediaSource(mediaSource);
...@@ -1428,24 +1388,12 @@ public class SimpleExoPlayer extends BasePlayer ...@@ -1428,24 +1388,12 @@ public class SimpleExoPlayer extends BasePlayer
} }
@Override @Override
public void moveMediaItem(int currentIndex, int newIndex) {
verifyApplicationThread();
player.moveMediaItem(currentIndex, newIndex);
}
@Override
public void moveMediaItems(int fromIndex, int toIndex, int newIndex) { public void moveMediaItems(int fromIndex, int toIndex, int newIndex) {
verifyApplicationThread(); verifyApplicationThread();
player.moveMediaItems(fromIndex, toIndex, newIndex); player.moveMediaItems(fromIndex, toIndex, newIndex);
} }
@Override @Override
public void removeMediaItem(int index) {
verifyApplicationThread();
player.removeMediaItem(index);
}
@Override
public void removeMediaItems(int fromIndex, int toIndex) { public void removeMediaItems(int fromIndex, int toIndex) {
verifyApplicationThread(); verifyApplicationThread();
player.removeMediaItems(fromIndex, toIndex); player.removeMediaItems(fromIndex, toIndex);
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
...@@ -151,26 +151,6 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer { ...@@ -151,26 +151,6 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
} }
@Override @Override
public void setMediaItem(MediaItem mediaItem) {
throw new UnsupportedOperationException();
}
@Override
public void setMediaItem(MediaItem mediaItem, long startPositionMs) {
throw new UnsupportedOperationException();
}
@Override
public void setMediaItem(MediaItem mediaItem, boolean resetPosition) {
throw new UnsupportedOperationException();
}
@Override
public void setMediaItems(List<MediaItem> mediaItems) {
throw new UnsupportedOperationException();
}
@Override
public void setMediaItems(List<MediaItem> mediaItems, boolean resetPosition) { public void setMediaItems(List<MediaItem> mediaItems, boolean resetPosition) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
...@@ -213,16 +193,6 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer { ...@@ -213,16 +193,6 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
} }
@Override @Override
public void addMediaItem(MediaItem mediaItem) {
throw new UnsupportedOperationException();
}
@Override
public void addMediaItem(int index, MediaItem mediaItem) {
throw new UnsupportedOperationException();
}
@Override
public void addMediaItems(List<MediaItem> mediaItems) { public void addMediaItems(List<MediaItem> mediaItems) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
...@@ -253,21 +223,11 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer { ...@@ -253,21 +223,11 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
} }
@Override @Override
public void moveMediaItem(int currentIndex, int newIndex) {
throw new UnsupportedOperationException();
}
@Override
public void moveMediaItems(int fromIndex, int toIndex, int newIndex) { public void moveMediaItems(int fromIndex, int toIndex, int newIndex) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override @Override
public void removeMediaItem(int index) {
throw new UnsupportedOperationException();
}
@Override
public void removeMediaItems(int fromIndex, int toIndex) { public void removeMediaItems(int fromIndex, int toIndex) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
......
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