Cleanup

4 files changed, 5 insertions, 135 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java
index 1d233ff0c..b523d9675 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java
@@ -92,18 +92,13 @@ public class ExoPlayerWrapper implements IPlayer {
 
             @Override
             public void onSeekProcessed() {
-
+                audioSeekCompleteListener.onSeekComplete(null);
             }
         });
         return p;
     }
 
     @Override
-    public boolean canSetPitch() {
-        return true;
-    }
-
-    @Override
     public boolean canSetSpeed() {
         return true;
     }
@@ -114,18 +109,13 @@ public class ExoPlayerWrapper implements IPlayer {
     }
 
     @Override
-    public float getCurrentPitchStepsAdjustment() {
-        return 0;
-    }
-
-    @Override
     public int getCurrentPosition() {
         return (int) mExoPlayer.getCurrentPosition();
     }
 
     @Override
     public float getCurrentSpeedMultiplier() {
-        return 0;
+        return mExoPlayer.getPlaybackParameters().speed;
     }
 
     @Override
@@ -134,21 +124,6 @@ public class ExoPlayerWrapper implements IPlayer {
     }
 
     @Override
-    public float getMaxSpeedMultiplier() {
-        return 0;
-    }
-
-    @Override
-    public float getMinSpeedMultiplier() {
-        return 0;
-    }
-
-    @Override
-    public boolean isLooping() {
-        return mExoPlayer.getRepeatMode() == Player.REPEAT_MODE_ONE;
-    }
-
-    @Override
     public boolean isPlaying() {
         return mExoPlayer.getPlayWhenReady();
     }
@@ -164,15 +139,13 @@ public class ExoPlayerWrapper implements IPlayer {
     }
 
     @Override
-    public void prepareAsync() {
-        mExoPlayer.prepare(mediaSource);
-    }
-
-    @Override
     public void release() {
         if (mExoPlayer != null) {
             mExoPlayer.release();
         }
+        audioSeekCompleteListener = null;
+        audioCompletionListener = null;
+        audioErrorListener = null;
     }
 
     @Override
@@ -184,7 +157,6 @@ public class ExoPlayerWrapper implements IPlayer {
     @Override
     public void seekTo(int i) throws IllegalStateException {
         mExoPlayer.seekTo(i);
-        audioSeekCompleteListener.onSeekComplete(null);
     }
 
     @Override
@@ -198,11 +170,6 @@ public class ExoPlayerWrapper implements IPlayer {
     }
 
     @Override
-    public void setScreenOnWhilePlaying(boolean screenOn) {
-
-    }
-
-    @Override
     public void setDataSource(String s) throws IllegalArgumentException, IllegalStateException {
         DataSource.Factory dataSourceFactory =
                 new DefaultDataSourceFactory(mContext, Util.getUserAgent(mContext, mContext.getPackageName()), null);
@@ -216,27 +183,6 @@ public class ExoPlayerWrapper implements IPlayer {
     }
 
     @Override
-    public void setEnableSpeedAdjustment(boolean b) {
-
-    }
-
-    @Override
-    public void setLooping(boolean b) {
-        mExoPlayer.setRepeatMode(b ? Player.REPEAT_MODE_ONE : Player.REPEAT_MODE_OFF);
-    }
-
-    @Override
-    public void setPitchStepsAdjustment(float v) {
-
-    }
-
-    @Override
-    public void setPlaybackPitch(float v) {
-        PlaybackParameters params = mExoPlayer.getPlaybackParameters();
-        mExoPlayer.setPlaybackParameters(new PlaybackParameters(params.speed, v));
-    }
-
-    @Override
     public void setPlaybackSpeed(float v) {
         PlaybackParameters params = mExoPlayer.getPlaybackParameters();
         mExoPlayer.setPlaybackParameters(new PlaybackParameters(v, params.pitch));
@@ -267,11 +213,6 @@ public class ExoPlayerWrapper implements IPlayer {
         mExoPlayer.stop();
     }
 
-    @Override
-    public void setVideoScalingMode(int mode) {
-        mExoPlayer.setVideoScalingMode(mode);
-    }
-
     void setOnCompletionListener(MediaPlayer.OnCompletionListener audioCompletionListener) {
         this.audioCompletionListener = audioCompletionListener;
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java
index a1530e808..16d05dbb9 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java
@@ -27,12 +27,6 @@ public class AudioPlayer extends MediaPlayer implements IPlayer {
 			};
 
 	@Override
-	public void setScreenOnWhilePlaying(boolean screenOn) {
-		Log.e(TAG, "Setting screen on while playing not supported in Audio Player");
-		throw new UnsupportedOperationException("Setting screen on while playing not supported in Audio Player");
-	}
-
-	@Override
 	public void setDisplay(SurfaceHolder sh) {
 		if (sh != null) {
 			Log.e(TAG, "Setting display not supported in Audio Player");
@@ -40,11 +34,6 @@ public class AudioPlayer extends MediaPlayer implements IPlayer {
 		}
 	}
 
-    @Override
-    public void setVideoScalingMode(int mode) {
-        throw new UnsupportedOperationException("Setting scaling mode is not supported in Audio Player");
-    }
-
 	@Override
 	protected boolean useSonic() {
 		return UserPreferences.useSonic();
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/IPlayer.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/IPlayer.java
index aba395ec1..a372f4241 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/IPlayer.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/IPlayer.java
@@ -6,13 +6,11 @@ import android.view.SurfaceHolder;
 import java.io.IOException;
 
 public interface IPlayer {
-	boolean canSetPitch();
 
 	boolean canSetSpeed();
 
 	boolean canDownmix();
 
-	float getCurrentPitchStepsAdjustment();
 
 	int getCurrentPosition();
 
@@ -20,20 +18,12 @@ public interface IPlayer {
 
 	int getDuration();
 
-	float getMaxSpeedMultiplier();
-
-	float getMinSpeedMultiplier();
-
-	boolean isLooping();
-
 	boolean isPlaying();
 
 	void pause();
 
 	void prepare() throws IllegalStateException, IOException;
 
-	void prepareAsync();
-
 	void release();
 
 	void reset();
@@ -42,21 +32,11 @@ public interface IPlayer {
 
 	void setAudioStreamType(int streamtype);
 
-	void setScreenOnWhilePlaying(boolean screenOn);
-
 	void setDataSource(String path) throws IllegalStateException, IOException,
             IllegalArgumentException, SecurityException;
 
 	void setDisplay(SurfaceHolder sh);
 
-	void setEnableSpeedAdjustment(boolean enableSpeedAdjustment);
-
-	void setLooping(boolean looping);
-
-	void setPitchStepsAdjustment(float pitchSteps);
-
-	void setPlaybackPitch(float f);
-
 	void setPlaybackSpeed(float f);
 
 	void setDownmix(boolean enable);
@@ -67,7 +47,5 @@ public interface IPlayer {
 
 	void stop();
 
-    void setVideoScalingMode(int mode);
-
     void setWakeMode(Context context, int mode);
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/VideoPlayer.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/VideoPlayer.java
index 368379509..1d04fb878 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/VideoPlayer.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/VideoPlayer.java
@@ -7,11 +7,6 @@ public class VideoPlayer extends MediaPlayer implements IPlayer {
 	private static final String TAG = "VideoPlayer";
 
 	@Override
-	public boolean canSetPitch() {
-		return false;
-	}
-
-	@Override
 	public boolean canSetSpeed() {
 		return false;
 	}
@@ -22,44 +17,11 @@ public class VideoPlayer extends MediaPlayer implements IPlayer {
 	}
 
 	@Override
-	public float getCurrentPitchStepsAdjustment() {
-		return 1;
-	}
-
-	@Override
 	public float getCurrentSpeedMultiplier() {
 		return 1;
 	}
 
 	@Override
-	public float getMaxSpeedMultiplier() {
-		return 1;
-	}
-
-	@Override
-	public float getMinSpeedMultiplier() {
-		return 1;
-	}
-
-	@Override
-	public void setEnableSpeedAdjustment(boolean enableSpeedAdjustment) throws UnsupportedOperationException {
-		Log.e(TAG, "Setting enable speed adjustment unsupported in video player");
-		throw new UnsupportedOperationException("Setting enable speed adjustment unsupported in video player");
-	}
-
-	@Override
-	public void setPitchStepsAdjustment(float pitchSteps) {
-		Log.e(TAG, "Setting pitch steps adjustment unsupported in video player");
-		throw new UnsupportedOperationException("Setting pitch steps adjustment unsupported in video player");
-	}
-
-	@Override
-	public void setPlaybackPitch(float f) {
-		Log.e(TAG, "Setting playback pitch unsupported in video player");
-		throw new UnsupportedOperationException("Setting playback pitch unsupported in video player");
-	}
-
-	@Override
 	public void setPlaybackSpeed(float f) {
 		Log.e(TAG, "Setting playback speed unsupported in video player");
 		throw new UnsupportedOperationException("Setting playback speed unsupported in video player");