Castopod/AntennaPod
1
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2025-02-05 13:08:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
ByteHamster 2018-04-21 18:13:24 +02:00
parent d50dcac96e
commit df8f90083c
4 changed files with 5 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java
View File

@ -92,17 +92,12 @@ 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;
@ -113,11 +108,6 @@ public class ExoPlayerWrapper implements IPlayer {
return false;
}
@Override
public float getCurrentPitchStepsAdjustment() {
return 0;
}
@Override
public int getCurrentPosition() {
return (int) mExoPlayer.getCurrentPosition();
@ -125,7 +115,7 @@ public class ExoPlayerWrapper implements IPlayer {
@Override
public float getCurrentSpeedMultiplier() {
return 0;
return mExoPlayer.getPlaybackParameters().speed;
}
@Override
@ -133,21 +123,6 @@ public class ExoPlayerWrapper implements IPlayer {
return (int) mExoPlayer.getDuration();
}
@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();
@ -163,16 +138,14 @@ public class ExoPlayerWrapper implements IPlayer {
mExoPlayer.prepare(mediaSource);
}
@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
@ -197,11 +169,6 @@ public class ExoPlayerWrapper implements IPlayer {
mExoPlayer.setAudioAttributes(b.build());
}
@Override
public void setScreenOnWhilePlaying(boolean screenOn) {
}
@Override
public void setDataSource(String s) throws IllegalArgumentException, IllegalStateException {
DataSource.Factory dataSourceFactory =
@ -215,27 +182,6 @@ public class ExoPlayerWrapper implements IPlayer {
mExoPlayer.setVideoSurfaceHolder(sh);
}
@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();
@ -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;
}

11
core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java
View File

@ -26,12 +26,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) {
@ -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();

22
core/src/main/java/de/danoeh/antennapod/core/util/playback/IPlayer.java
View File

@ -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);
}

38
core/src/main/java/de/danoeh/antennapod/core/util/playback/VideoPlayer.java
View File

@ -6,11 +6,6 @@ import android.util.Log;
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;
@ -21,44 +16,11 @@ public class VideoPlayer extends MediaPlayer implements IPlayer {
return false;
}
@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");