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

simplify gapless update trigger

Browse Source
This commit is contained in:
Adrian Ulrich 2014-10-16 23:03:29 +02:00
parent 9633d7fc88
commit 12f2655ec8
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ch/blinkenlights/android/vanilla/PlaybackService.java
View File

@ -666,7 +666,6 @@ public final class PlaybackService extends Service
* re-creates a newone if needed. * re-creates a newone if needed.
*/ */
private void triggerGaplessUpdate() { private void triggerGaplessUpdate() {
// Log.d("VanillaMusic", "triggering gapless update");
if(mMediaPlayerInitialized != true) if(mMediaPlayerInitialized != true)
return; return;
@ -681,7 +680,6 @@ public final class PlaybackService extends Service
mMediaPlayer.setNextMediaPlayer(null); mMediaPlayer.setNextMediaPlayer(null);
mPreparedMediaPlayer.release(); mPreparedMediaPlayer.release();
mPreparedMediaPlayer = null; mPreparedMediaPlayer = null;
// Log.d("VanillaMusic", "old prepared player destroyed");
} }
int fa = finishAction(mState); int fa = finishAction(mState);
@ -694,7 +692,7 @@ public final class PlaybackService extends Service
mPreparedMediaPlayer = getNewMediaPlayer(); mPreparedMediaPlayer = getNewMediaPlayer();
prepareMediaPlayer(mPreparedMediaPlayer, nextSong.path); prepareMediaPlayer(mPreparedMediaPlayer, nextSong.path);
mMediaPlayer.setNextMediaPlayer(mPreparedMediaPlayer); mMediaPlayer.setNextMediaPlayer(mPreparedMediaPlayer);
// Log.d("VanillaMusic", "New media player prepared as "+mPreparedMediaPlayer+" with path "+nextSong.path); Log.d("VanillaMusic", "New media player prepared with path "+nextSong.path);
} catch (IOException e) { } catch (IOException e) {
Log.e("VanillaMusic", "IOException", e); Log.e("VanillaMusic", "IOException", e);
} }
@ -922,8 +920,6 @@ public final class PlaybackService extends Service
mTimeline.setShuffleMode(shuffleMode(state)); mTimeline.setShuffleMode(shuffleMode(state));
if ((toggled & MASK_FINISH) != 0) if ((toggled & MASK_FINISH) != 0)
mTimeline.setFinishAction(finishAction(state)); mTimeline.setFinishAction(finishAction(state));
triggerGaplessUpdate();
} }
private void broadcastChange(int state, Song song, long uptime) private void broadcastChange(int state, Song song, long uptime)
@ -1197,7 +1193,11 @@ public final class PlaybackService extends Service
prepareMediaPlayer(mMediaPlayer, song.path); prepareMediaPlayer(mMediaPlayer, song.path);
} }
mMediaPlayerInitialized = true; mMediaPlayerInitialized = true;
// Cancel any queued gapless triggers: we are updating it right now
mHandler.removeMessages(GAPLESS_UPDATE);
triggerGaplessUpdate(); triggerGaplessUpdate();
if (mPendingSeek != 0 && mPendingSeekSong == song.id) { if (mPendingSeek != 0 && mPendingSeekSong == song.id) {
@ -1344,6 +1344,7 @@ public final class PlaybackService extends Service
private static final int PROCESS_SONG = 13; private static final int PROCESS_SONG = 13;
private static final int PROCESS_STATE = 14; private static final int PROCESS_STATE = 14;
private static final int SKIP_BROKEN_SONG = 15; private static final int SKIP_BROKEN_SONG = 15;
private static final int GAPLESS_UPDATE = 16;
@Override @Override
public boolean handleMessage(Message message) public boolean handleMessage(Message message)
@ -1402,6 +1403,9 @@ public final class PlaybackService extends Service
} }
mHandler.sendMessage(mHandler.obtainMessage(CALL_GO, 0, 0)); mHandler.sendMessage(mHandler.obtainMessage(CALL_GO, 0, 0));
break; break;
case GAPLESS_UPDATE:
triggerGaplessUpdate();
break;
default: default:
return false; return false;
} }
@ -1572,7 +1576,6 @@ public final class PlaybackService extends Service
} }
Toast.makeText(this, getResources().getQuantityString(text, count, count), Toast.LENGTH_SHORT).show(); Toast.makeText(this, getResources().getQuantityString(text, count, count), Toast.LENGTH_SHORT).show();
triggerGaplessUpdate();
} }
/** /**
@ -1628,7 +1631,6 @@ public final class PlaybackService extends Service
public void clearQueue() public void clearQueue()
{ {
mTimeline.clearQueue(); mTimeline.clearQueue();
triggerGaplessUpdate();
} }
/** /**
@ -1644,6 +1646,12 @@ public final class PlaybackService extends Service
{ {
mHandler.removeMessages(SAVE_STATE); mHandler.removeMessages(SAVE_STATE);
mHandler.sendEmptyMessageDelayed(SAVE_STATE, 5000); mHandler.sendEmptyMessageDelayed(SAVE_STATE, 5000);
// Trigger a gappless update for the new timeline
// This might get canceled if setCurrentSong() also fired a call
// to processSong();
mHandler.removeMessages(GAPLESS_UPDATE);
mHandler.sendEmptyMessageDelayed(GAPLESS_UPDATE, 350);
} }
@Override @Override