From 57042adec74a7e02cd69d6ef7ad6300ef1a36635 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Thu, 1 Nov 2018 11:55:40 +0000
Subject: [PATCH] Remove methods now in BasePlayer

---
 .../exoplayer2/ext/cast/CastPlayer.java       | 26 ----------------
 .../android/exoplayer2/ExoPlayerImpl.java     | 26 ----------------
 .../android/exoplayer2/SimpleExoPlayer.java   | 30 -------------------
 .../exoplayer2/testutil/StubExoPlayer.java    | 20 -------------
 4 files changed, 102 deletions(-)

diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
index 1573401521..6cf6309796 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
@@ -365,32 +365,6 @@ public final class CastPlayer extends BasePlayer {
     }
   }
 
-  @Override
-  public boolean hasPrevious() {
-    return getPreviousWindowIndex() != C.INDEX_UNSET;
-  }
-
-  @Override
-  public void previous() {
-    int previousWindowIndex = getPreviousWindowIndex();
-    if (previousWindowIndex != C.INDEX_UNSET) {
-      seekToDefaultPosition(previousWindowIndex);
-    }
-  }
-
-  @Override
-  public boolean hasNext() {
-    return getNextWindowIndex() != C.INDEX_UNSET;
-  }
-
-  @Override
-  public void next() {
-    int nextWindowIndex = getPreviousWindowIndex();
-    if (nextWindowIndex != C.INDEX_UNSET) {
-      seekToDefaultPosition(nextWindowIndex);
-    }
-  }
-
   @Override
   public void setPlaybackParameters(@Nullable PlaybackParameters playbackParameters) {
     // Unsupported by the RemoteMediaClient API. Do nothing.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index fb27452f89..ffdadb78f7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -329,32 +329,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
     }
   }
 
-  @Override
-  public boolean hasPrevious() {
-    return getPreviousWindowIndex() != C.INDEX_UNSET;
-  }
-
-  @Override
-  public void previous() {
-    int previousWindowIndex = getPreviousWindowIndex();
-    if (previousWindowIndex != C.INDEX_UNSET) {
-      seekToDefaultPosition(previousWindowIndex);
-    }
-  }
-
-  @Override
-  public boolean hasNext() {
-    return getNextWindowIndex() != C.INDEX_UNSET;
-  }
-
-  @Override
-  public void next() {
-    int nextWindowIndex = getPreviousWindowIndex();
-    if (nextWindowIndex != C.INDEX_UNSET) {
-      seekToDefaultPosition(nextWindowIndex);
-    }
-  }
-
   @Override
   public void setPlaybackParameters(@Nullable PlaybackParameters playbackParameters) {
     if (playbackParameters == null) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 36fd0868f9..8517556887 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -934,36 +934,6 @@ public class SimpleExoPlayer extends BasePlayer
     player.seekTo(windowIndex, positionMs);
   }
 
-  @Override
-  public boolean hasPrevious() {
-    verifyApplicationThread();
-    return getPreviousWindowIndex() != C.INDEX_UNSET;
-  }
-
-  @Override
-  public void previous() {
-    verifyApplicationThread();
-    if (hasPrevious()) {
-      analyticsCollector.notifySeekStarted();
-      player.previous();
-    }
-  }
-
-  @Override
-  public boolean hasNext() {
-    verifyApplicationThread();
-    return getNextWindowIndex() != C.INDEX_UNSET;
-  }
-
-  @Override
-  public void next() {
-    verifyApplicationThread();
-    if (hasNext()) {
-      analyticsCollector.notifySeekStarted();
-      player.next();
-    }
-  }
-
   @Override
   public void setPlaybackParameters(@Nullable PlaybackParameters playbackParameters) {
     verifyApplicationThread();
diff --git a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
index d1236a7a2e..156b573df8 100644
--- a/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
+++ b/testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
@@ -134,26 +134,6 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public boolean hasPrevious() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void previous() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean hasNext() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void next() {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public void setPlaybackParameters(PlaybackParameters playbackParameters) {
     throw new UnsupportedOperationException();