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

Restore state after sdcard unmounted

Browse Source
This commit is contained in:
Christopher Eby 2012-01-21 23:18:18 -06:00
parent cc4abad6f3
commit a46a1ad0a6
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,7 @@ public final class PlaybackService extends Service
/** /**
* State file version that indicates data order. * State file version that indicates data order.
*/ */
private static final int STATE_VERSION = 4; private static final int STATE_VERSION = 5;
private static final int NOTIFICATION_ID = 2; private static final int NOTIFICATION_ID = 2;
@ -271,7 +271,18 @@ public final class PlaybackService extends Service
private Song mCurrentSong; private Song mCurrentSong;
boolean mPlayingBeforeCall; boolean mPlayingBeforeCall;
/**
* Stores the saved position in the current song from saved state. Should
* be seeked to when the song is loaded into MediaPlayer. Used only during
* initialization. The song that the saved position is for is stored in
* {@link #mPendingSeekSong}.
*/
private int mPendingSeek; private int mPendingSeek;
/**
* The id of the song that the mPendingSeek position is for. -1 indicates
* an invalid song. Value is undefined when mPendingSeek is 0.
*/
private long mPendingSeekSong;
public Receiver mReceiver; public Receiver mReceiver;
public InCallListener mCallListener; public InCallListener mCallListener;
private String mErrorMessage; private String mErrorMessage;
@ -563,6 +574,14 @@ public final class PlaybackService extends Service
} }
} }
if ((toggled & FLAG_NO_MEDIA) != 0 && (state & FLAG_NO_MEDIA) != 0) {
Song song = mCurrentSong;
if (song != null && mMediaPlayerInitialized) {
mPendingSeek = mMediaPlayer.getCurrentPosition();
mPendingSeekSong = song.id;
}
}
if ((toggled & MASK_SHUFFLE) != 0) if ((toggled & MASK_SHUFFLE) != 0)
mTimeline.setShuffleMode(shuffleMode(state)); mTimeline.setShuffleMode(shuffleMode(state));
if ((toggled & MASK_FINISH) != 0) if ((toggled & MASK_FINISH) != 0)
@ -817,7 +836,7 @@ public final class PlaybackService extends Service
mMediaPlayer.prepare(); mMediaPlayer.prepare();
mMediaPlayerInitialized = true; mMediaPlayerInitialized = true;
if (mPendingSeek != 0) { if (mPendingSeek != 0 && mPendingSeekSong == song.id) {
mMediaPlayer.seekTo(mPendingSeek); mMediaPlayer.seekTo(mPendingSeek);
mPendingSeek = 0; mPendingSeek = 0;
} }
@ -1364,6 +1383,7 @@ public final class PlaybackService extends Service
if (in.readLong() == STATE_FILE_MAGIC && in.readInt() == STATE_VERSION) { if (in.readLong() == STATE_FILE_MAGIC && in.readInt() == STATE_VERSION) {
mPendingSeek = in.readInt(); mPendingSeek = in.readInt();
mPendingSeekSong = in.readLong();
mTimeline.readState(in); mTimeline.readState(in);
state |= mTimeline.getShuffleMode() << SHIFT_SHUFFLE; state |= mTimeline.getShuffleMode() << SHIFT_SHUFFLE;
state |= mTimeline.getFinishAction() << SHIFT_FINISH; state |= mTimeline.getFinishAction() << SHIFT_FINISH;
@ -1389,9 +1409,11 @@ public final class PlaybackService extends Service
{ {
try { try {
DataOutputStream out = new DataOutputStream(openFileOutput(STATE_FILE, 0)); DataOutputStream out = new DataOutputStream(openFileOutput(STATE_FILE, 0));
Song song = mCurrentSong;
out.writeLong(STATE_FILE_MAGIC); out.writeLong(STATE_FILE_MAGIC);
out.writeInt(STATE_VERSION); out.writeInt(STATE_VERSION);
out.writeInt(pendingSeek); out.writeInt(pendingSeek);
out.writeLong(song == null ? -1 : song.id);
mTimeline.writeState(out); mTimeline.writeState(out);
out.close(); out.close();
} catch (IOException e) { } catch (IOException e) {