Skip to content

Commit

Permalink
Fixing issue where update progress thread wasn't starting after unpause
Browse files Browse the repository at this point in the history
  • Loading branch information
@rebeccanesson
rebeccanesson committed Nov 28, 2012
1 parent 56f652d commit f072d00
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 34 deletions.
1 change: 1 addition & 0 deletions src/org/prx/android/playerhater/MediaPlayerWrapper.java
View file
Expand Up @@ -73,6 +73,7 @@ public void prepare() throws IOException, IllegalStateException {
this.mMediaPlayer.prepare(); this.mMediaPlayer.prepare();
this.mState = PREPARED; this.mState = PREPARED;
} else { } else {
Log.d(TAG, "state is " + this.mState);
throw (new IllegalStateException()); throw (new IllegalStateException());
} }
} }
Expand Down
86 changes: 52 additions & 34 deletions src/org/prx/android/playerhater/PlaybackService.java
View file
Expand Up @@ -156,17 +156,8 @@ public boolean pause() throws IllegalStateException {
Log.d(TAG, "PAUSE"); Log.d(TAG, "PAUSE");
mediaPlayer.pause(); mediaPlayer.pause();
// mNotificationHandler.stopNotification(); // mNotificationHandler.stopNotification();
if (updateProgressThread != null && updateProgressThread.isAlive()) { stopProgressThread();
mHandler.removeCallbacks(updateProgressRunner);
updateProgressThread.interrupt();
updateProgressThread = null;
}
sendIsPaused(); sendIsPaused();
if (updateProgressThread != null && updateProgressThread.isAlive()) {
mHandler.removeCallbacks(updateProgressRunner);
updateProgressThread.interrupt();
updateProgressThread = null;
}
this.mNotificationHandler.setToPlay(); this.mNotificationHandler.setToPlay();
try { try {
mRemoteControlClient.setPlaybackState(RemoteControlClient.PLAYSTATE_PAUSED); mRemoteControlClient.setPlaybackState(RemoteControlClient.PLAYSTATE_PAUSED);
Expand Down Expand Up @@ -272,20 +263,39 @@ public boolean playAt(int startTime) throws IllegalStateException, IOException {
this.startTime = startTime * 1000; this.startTime = startTime * 1000;
return play(); return play();
} }

private void stopProgressThread() {
if (updateProgressThread != null && updateProgressThread.isAlive()) {
mHandler.removeCallbacks(updateProgressRunner);
updateProgressThread.interrupt();
updateProgressThread = null;
}
}

private void startProgressThread() {
stopProgressThread();
updateProgressThread = new Thread(updateProgressRunner);
updateProgressThread.start();
}


public boolean play() throws IllegalStateException, IOException { public boolean play() throws IllegalStateException, IOException {

switch (mediaPlayer.getState()) { switch (mediaPlayer.getState()) {
case MediaPlayerWrapper.INITIALIZED: case MediaPlayerWrapper.INITIALIZED:
case MediaPlayerWrapper.STOPPED: case MediaPlayerWrapper.STOPPED:
performPrepare(); if (this.nowPlayingType == FILE) {
performPrepareSynchronous();
} else {
performPrepare();
}
break; break;
case MediaPlayerWrapper.PREPARED: case MediaPlayerWrapper.PREPARED:
case MediaPlayerWrapper.PAUSED: case MediaPlayerWrapper.PAUSED:
mediaPlayer.start(); mediaPlayer.start();
sendIsPlaying(); sendIsPlaying();
if (mAutoNotify) if (mAutoNotify) {
mNotificationHandler.startNotification(); mNotificationHandler.startNotification();
}
startProgressThread();
break; break;
case MediaPlayerWrapper.IDLE: case MediaPlayerWrapper.IDLE:
if (nowPlayingType == URL) { if (nowPlayingType == URL) {
Expand Down Expand Up @@ -383,26 +393,41 @@ private void performPrepare() {
sendIsLoading(); sendIsLoading();
mediaPlayer.prepareAsync(); mediaPlayer.prepareAsync();


if (updateProgressThread != null && updateProgressThread.isAlive()) { startProgressThread();
mHandler.removeCallbacks(updateProgressRunner); }
updateProgressThread.interrupt();
updateProgressThread = null; private void performPrepareSynchronous() {
Log.d(TAG, "Starting synchronous preparation of: " + getNowPlaying());
sendIsLoading();
int retryCount = 0;
while (retryCount < 5) {
try {
Log.d(TAG, "trying " + retryCount);
if (mediaPlayer.getState() == mediaPlayer.PREPARED) {
break;
}
mediaPlayer.prepare();
} catch (IOException e) {
retryCount++;
e.printStackTrace();
}
} }
if (retryCount == 5) {
reset();
onError(null, 0, 0);
return;
}
mediaPlayer.start();


updateProgressThread = new Thread(updateProgressRunner); startProgressThread();
updateProgressThread.start();
} }


public boolean stop() { public boolean stop() {
Log.d(TAG, "STOP"); Log.d(TAG, "STOP");
mediaPlayer.stop(); mediaPlayer.stop();
mNotificationHandler.stopNotification(); mNotificationHandler.stopNotification();
sendIsStopped(); sendIsStopped();
if (updateProgressThread != null && updateProgressThread.isAlive()) { stopProgressThread();
mHandler.removeCallbacks(updateProgressRunner);
updateProgressThread.interrupt();
updateProgressThread = null;
}
mAudioManager.unregisterMediaButtonEventReceiver(mRemoteControlResponder); mAudioManager.unregisterMediaButtonEventReceiver(mRemoteControlResponder);
try { try {
mAudioManager.unregisterRemoteControlClient(mRemoteControlClient); mAudioManager.unregisterRemoteControlClient(mRemoteControlClient);
Expand Down Expand Up @@ -482,11 +507,8 @@ public void setOnCompletionListener(OnCompletionListener listener) {
@Override @Override
public boolean onError(MediaPlayer mp, int what, int extra) { public boolean onError(MediaPlayer mp, int what, int extra) {
Log.e(TAG, "Got MediaPlayer error: " + what + " / " + extra); Log.e(TAG, "Got MediaPlayer error: " + what + " / " + extra);
if (updateProgressThread != null && updateProgressThread.isAlive()) { stopProgressThread();
mHandler.removeCallbacks(updateProgressRunner); reset();
updateProgressThread.interrupt();
updateProgressThread = null;
}
if (mOnErrorListener != null) { if (mOnErrorListener != null) {
Log.e(TAG, "Passing error along."); Log.e(TAG, "Passing error along.");
return mOnErrorListener.onError(mp, what, extra); return mOnErrorListener.onError(mp, what, extra);
Expand Down Expand Up @@ -622,11 +644,7 @@ protected static NotificationHandler createNotificationHandler(PlaybackService s
@Override @Override
public void onCompletion(MediaPlayer mp) { public void onCompletion(MediaPlayer mp) {
Log.e(TAG, "Got MediaPlayer completion"); Log.e(TAG, "Got MediaPlayer completion");
if (updateProgressThread != null && updateProgressThread.isAlive()) { stopProgressThread();
mHandler.removeCallbacks(updateProgressRunner);
updateProgressThread.interrupt();
updateProgressThread = null;
}
if (mOnCompletionListener != null) { if (mOnCompletionListener != null) {
Log.e(TAG, "Passing completion along."); Log.e(TAG, "Passing completion along.");
mOnCompletionListener.onCompletion(mp); mOnCompletionListener.onCompletion(mp);
Expand Down

0 comments on commit f072d00

Please sign in to comment.