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

use saveActiveSongs and broadcastChangedSongs

Browse Source 
in clearQueue and emptyQueue
also, call pause and setFlag before calling emptyQueue
This commit is contained in:
Amin Bandali 2015-04-14 15:32:24 -04:00
parent 7b6fc6218a
commit ddb129b660
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1642,6 +1642,8 @@ public final class PlaybackService extends Service
*/ */
public void emptyQueue() public void emptyQueue()
{ {
pause();
setFlag(FLAG_EMPTY_QUEUE);
mTimeline.emptyQueue(); mTimeline.emptyQueue();
} }

14
src/ch/blinkenlights/android/vanilla/SongTimeline.java
View File

@ -774,15 +774,12 @@ public final class SongTimeline {
public void clearQueue() public void clearQueue()
{ {
synchronized (this) { synchronized (this) {
saveActiveSongs();
if (mCurrentPos + 1 < mSongs.size()) if (mCurrentPos + 1 < mSongs.size())
mSongs.subList(mCurrentPos + 1, mSongs.size()).clear(); mSongs.subList(mCurrentPos + 1, mSongs.size()).clear();
} }
if (mCallback != null) { broadcastChangedSongs();
mCallback.activeSongReplaced(+1, getSong(+1));
mCallback.positionInfoChanged();
}
changed(); changed();
} }
@ -792,14 +789,11 @@ public final class SongTimeline {
public void emptyQueue() public void emptyQueue()
{ {
synchronized (this) { synchronized (this) {
saveActiveSongs();
mSongs.clear(); mSongs.clear();
} }
if (mCallback != null) { broadcastChangedSongs();
mCallback.activeSongReplaced(+1, getSong(+1));
mCallback.positionInfoChanged();
}
changed(); changed();
} }