From 84e888bcb098db3fee5bf41e6883bf83c99aea74 Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Sun, 31 Jan 2016 13:34:21 +0100 Subject: Minor changes --- .../org/antennapod/audio/AbstractAudioPlayer.java | 4 +-- .../org/antennapod/audio/AndroidAudioPlayer.java | 40 +++++++++------------- .../java/org/antennapod/audio/MediaPlayer.java | 27 ++++++--------- .../antennapod/audio/ServiceBackedAudioPlayer.java | 2 +- 4 files changed, 29 insertions(+), 44 deletions(-) diff --git a/library/src/main/java/org/antennapod/audio/AbstractAudioPlayer.java b/library/src/main/java/org/antennapod/audio/AbstractAudioPlayer.java index 05198a7..89b98b5 100644 --- a/library/src/main/java/org/antennapod/audio/AbstractAudioPlayer.java +++ b/library/src/main/java/org/antennapod/audio/AbstractAudioPlayer.java @@ -97,7 +97,7 @@ public abstract class AbstractAudioPlayer { public abstract void stop(); - protected ReentrantLock lockMuteOnPreparedCount = new ReentrantLock(); + protected final ReentrantLock lockMuteOnPreparedCount = new ReentrantLock(); public void muteNextOnPrepare() { lockMuteOnPreparedCount.lock(); Log.d(MPI_TAG, "muteNextOnPrepare()"); @@ -109,7 +109,7 @@ public abstract class AbstractAudioPlayer { } } - protected ReentrantLock lockMuteOnSeekCount = new ReentrantLock(); + protected final ReentrantLock lockMuteOnSeekCount = new ReentrantLock(); public void muteNextSeek() { lockMuteOnSeekCount.lock(); Log.d(MPI_TAG, "muteNextOnSeek()"); diff --git a/library/src/main/java/org/antennapod/audio/AndroidAudioPlayer.java b/library/src/main/java/org/antennapod/audio/AndroidAudioPlayer.java index 3398f86..f6f3ab7 100644 --- a/library/src/main/java/org/antennapod/audio/AndroidAudioPlayer.java +++ b/library/src/main/java/org/antennapod/audio/AndroidAudioPlayer.java @@ -27,10 +27,10 @@ public class AndroidAudioPlayer extends AbstractAudioPlayer { private final static String AMP_TAG = "AndroidMediaPlayer"; - android.media.MediaPlayer mp = null; + MediaPlayer mp = null; - private android.media.MediaPlayer.OnBufferingUpdateListener onBufferingUpdateListener = new android.media.MediaPlayer.OnBufferingUpdateListener() { - public void onBufferingUpdate(android.media.MediaPlayer mp, int percent) { + private final MediaPlayer.OnBufferingUpdateListener onBufferingUpdateListener = new MediaPlayer.OnBufferingUpdateListener() { + public void onBufferingUpdate(MediaPlayer mp, int percent) { if (owningMediaPlayer != null) { owningMediaPlayer.lock.lock(); try { @@ -47,8 +47,8 @@ public class AndroidAudioPlayer extends AbstractAudioPlayer { } }; - private android.media.MediaPlayer.OnCompletionListener onCompletionListener = new android.media.MediaPlayer.OnCompletionListener() { - public void onCompletion(android.media.MediaPlayer mp) { + private final MediaPlayer.OnCompletionListener onCompletionListener = new MediaPlayer.OnCompletionListener() { + public void onCompletion(MediaPlayer mp) { Log.d(AMP_TAG, "onCompletionListener being called"); if (owningMediaPlayer != null) { owningMediaPlayer.lock.lock(); @@ -64,8 +64,8 @@ public class AndroidAudioPlayer extends AbstractAudioPlayer { } }; - private android.media.MediaPlayer.OnErrorListener onErrorListener = new android.media.MediaPlayer.OnErrorListener() { - public boolean onError(android.media.MediaPlayer mp, int what, int extra) { + private final MediaPlayer.OnErrorListener onErrorListener = new MediaPlayer.OnErrorListener() { + public boolean onError(MediaPlayer mp, int what, int extra) { // Once we're in errored state, any received messages are going to be junked if (owningMediaPlayer != null) { owningMediaPlayer.lock.lock(); @@ -82,8 +82,8 @@ public class AndroidAudioPlayer extends AbstractAudioPlayer { } }; - private android.media.MediaPlayer.OnInfoListener onInfoListener = new android.media.MediaPlayer.OnInfoListener() { - public boolean onInfo(android.media.MediaPlayer mp, int what, int extra) { + private final MediaPlayer.OnInfoListener onInfoListener = new MediaPlayer.OnInfoListener() { + public boolean onInfo(MediaPlayer mp, int what, int extra) { if (owningMediaPlayer != null) { owningMediaPlayer.lock.lock(); try { @@ -105,8 +105,8 @@ public class AndroidAudioPlayer extends AbstractAudioPlayer { // to PREPARED. Due to prepareAsync, that's the only // reasonable place to do it // The others it just didn't make sense to have a setOnXListener that didn't use the parameter - private android.media.MediaPlayer.OnPreparedListener onPreparedListener = new android.media.MediaPlayer.OnPreparedListener() { - public void onPrepared(android.media.MediaPlayer mp) { + private final MediaPlayer.OnPreparedListener onPreparedListener = new MediaPlayer.OnPreparedListener() { + public void onPrepared(MediaPlayer mp) { Log.d(AMP_TAG, "Calling onPreparedListener.onPrepared()"); if (AndroidAudioPlayer.this.owningMediaPlayer != null) { AndroidAudioPlayer.this.lockMuteOnPreparedCount.lock(); @@ -132,8 +132,8 @@ public class AndroidAudioPlayer extends AbstractAudioPlayer { } }; - private android.media.MediaPlayer.OnSeekCompleteListener onSeekCompleteListener = new android.media.MediaPlayer.OnSeekCompleteListener() { - public void onSeekComplete(android.media.MediaPlayer mp) { + private final MediaPlayer.OnSeekCompleteListener onSeekCompleteListener = new MediaPlayer.OnSeekCompleteListener() { + public void onSeekComplete(MediaPlayer mp) { if (owningMediaPlayer != null) { owningMediaPlayer.lock.lock(); try { @@ -196,7 +196,7 @@ public class AndroidAudioPlayer extends AbstractAudioPlayer { // } if (mp == null) { - throw new IllegalStateException("Did not instantiate android.media.MediaPlayer successfully"); + throw new IllegalStateException("Did not instantiate MediaPlayer successfully"); } mp.setOnBufferingUpdateListener(this.onBufferingUpdateListener); @@ -215,20 +215,12 @@ public class AndroidAudioPlayer extends AbstractAudioPlayer { @Override public boolean canSetPitch() { - if(Build.VERSION.SDK_INT >= 23) { - return true; - } else { - return false; - } + return Build.VERSION.SDK_INT >= 23; } @Override public boolean canSetSpeed() { - if(Build.VERSION.SDK_INT >= 23) { - return true; - } else { - return false; - } + return Build.VERSION.SDK_INT >= 23; } @Override diff --git a/library/src/main/java/org/antennapod/audio/MediaPlayer.java b/library/src/main/java/org/antennapod/audio/MediaPlayer.java index 61730a4..9c6546b 100644 --- a/library/src/main/java/org/antennapod/audio/MediaPlayer.java +++ b/library/src/main/java/org/antennapod/audio/MediaPlayer.java @@ -57,8 +57,7 @@ public class MediaPlayer { * @param arg0 The owning media player * @param pitchAdjustmentAvailable True if pitch adjustment is available, false if not */ - public abstract void onPitchAdjustmentAvailableChanged( - MediaPlayer arg0, boolean pitchAdjustmentAvailable); + void onPitchAdjustmentAvailableChanged(MediaPlayer arg0, boolean pitchAdjustmentAvailable); } public interface OnPreparedListener { @@ -82,7 +81,7 @@ public class MediaPlayer { IDLE, INITIALIZED, PREPARED, STARTED, PAUSED, STOPPED, PREPARING, PLAYBACK_COMPLETED, END, ERROR } - private static Uri SPEED_ADJUSTMENT_MARKET_URI = Uri.parse("market://details?id=com.aocate.presto"); + private final static Uri SPEED_ADJUSTMENT_MARKET_URI = Uri.parse("market://details?id=com.aocate.presto"); private static Intent prestoMarketIntent = null; @@ -186,9 +185,9 @@ public class MediaPlayer { // In some cases, we're going to have to replace the // android.media.MediaPlayer on the fly, and we don't want to touch the // wrong media player, so lock it way too much. - ReentrantLock lock = new ReentrantLock(); + final ReentrantLock lock = new ReentrantLock(); private int mAudioStreamType = AudioManager.STREAM_MUSIC; - private Context mContext; + private final Context mContext; private boolean mIsLooping = false; private float mLeftVolume = 1f; private float mPitchStepsAdjustment = 0f; @@ -246,7 +245,7 @@ public class MediaPlayer { }; OnPitchAdjustmentAvailableChangedListener pitchAdjustmentAvailableChangedListener = null; - MediaPlayer.OnPreparedListener onPreparedListener = new MediaPlayer.OnPreparedListener() { + final MediaPlayer.OnPreparedListener onPreparedListener = new MediaPlayer.OnPreparedListener() { public void onPrepared(MediaPlayer arg0) { Log.d(MP_TAG, "onPreparedListener 242 setting state to PREPARED"); MediaPlayer.this.state = State.PREPARED; @@ -354,7 +353,7 @@ public class MediaPlayer { } public boolean canFallback() { - return this.mpi == null || false == this.mpi instanceof AndroidAudioPlayer; + return this.mpi == null || !(this.mpi instanceof AndroidAudioPlayer); } public void fallback() { @@ -575,21 +574,15 @@ public class MediaPlayer { || (this.state == State.PAUSED) || (this.state == State.STOPPED)) { Log.d(MP_TAG, "switchMediaPlayerImpl(): start"); - if (to != null) { - to.start(); - } + to.start(); } if (this.state == State.PAUSED) { Log.d(MP_TAG, "switchMediaPlayerImpl(): paused"); - if (to != null) { - to.pause(); - } + to.pause(); } else if (this.state == State.STOPPED) { Log.d(MP_TAG, "switchMediaPlayerImpl(): stopped"); - if (to != null) { - to.stop(); - } + to.stop(); } this.mpi = to; @@ -823,7 +816,7 @@ public class MediaPlayer { * @return True if the Presto library is installed */ public boolean isPrestoLibraryInstalled() { - if ((this.mpi == null) || (this.mpi.mContext == null)) { + if (this.mpi == null || this.mpi.mContext == null) { return false; } return isPrestoLibraryInstalled(this.mpi.mContext); diff --git a/library/src/main/java/org/antennapod/audio/ServiceBackedAudioPlayer.java b/library/src/main/java/org/antennapod/audio/ServiceBackedAudioPlayer.java index 335f1fc..8ed38e7 100644 --- a/library/src/main/java/org/antennapod/audio/ServiceBackedAudioPlayer.java +++ b/library/src/main/java/org/antennapod/audio/ServiceBackedAudioPlayer.java @@ -84,7 +84,7 @@ public class ServiceBackedAudioPlayer extends AbstractAudioPlayer { MediaPlayer.getPrestoServiceIntent(context, INTENT_NAME); this.mPlayMediaServiceConnection = new ServiceConnection() { public void onServiceConnected(ComponentName name, IBinder service) { - IPlayMedia_0_8 tmpPlayMediaInterface = IPlayMedia_0_8.Stub.asInterface((IBinder) service); + IPlayMedia_0_8 tmpPlayMediaInterface = IPlayMedia_0_8.Stub.asInterface(service); Log.d(SBMP_TAG, "Setting up pmInterface 94"); if (ServiceBackedAudioPlayer.this.sessionId == 0) { -- cgit v1.2.3