norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Avoid calling getDuration/getPosition when MediaPlayer doesn't want us to

Browse Source
This commit is contained in:
Christopher Eby 2010-02-28 18:54:58 -06:00
parent fad23d11bc
commit cf62a8ebc4
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/org/kreed/vanilla/PlaybackService.java
View File

@ -89,14 +89,18 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
{
if (mMediaPlayer == null)
return 0;
return mMediaPlayer.getCurrentPosition();
synchronized (mMediaPlayer) {
return mMediaPlayer.getCurrentPosition();
}
}
public int getDuration()
{
if (mMediaPlayer == null)
return 0;
return mMediaPlayer.getDuration();
synchronized (mMediaPlayer) {
return mMediaPlayer.getDuration();
}
}
public void nextSong()
@ -130,10 +134,14 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
public void seekToProgress(int progress)
{
if (mMediaPlayer == null || !mMediaPlayer.isPlaying())
if (mMediaPlayer == null)
return;
long position = (long)mMediaPlayer.getDuration() * progress / 1000;
mMediaPlayer.seekTo((int)position);
synchronized (mMediaPlayer) {
if (!mMediaPlayer.isPlaying())
return;
long position = (long)mMediaPlayer.getDuration() * progress / 1000;
mMediaPlayer.seekTo((int)position);
}
}
};
@ -547,9 +555,11 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
}
try {
mMediaPlayer.reset();
mMediaPlayer.setDataSource(song.path);
mMediaPlayer.prepare();
synchronized (mMediaPlayer) {
mMediaPlayer.reset();
mMediaPlayer.setDataSource(song.path);
mMediaPlayer.prepare();
}
if (mState == STATE_PLAYING)
play();
} catch (IOException e) {