From ddb129b660cdcf1126bb886ed5b165348b32b512 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Tue, 14 Apr 2015 15:32:24 -0400 Subject: [PATCH] use saveActiveSongs and broadcastChangedSongs in clearQueue and emptyQueue also, call pause and setFlag before calling emptyQueue --- .../android/vanilla/PlaybackService.java | 2 ++ .../android/vanilla/SongTimeline.java | 14 ++++---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackService.java b/src/ch/blinkenlights/android/vanilla/PlaybackService.java index 647266c5..7d638f05 100644 --- a/src/ch/blinkenlights/android/vanilla/PlaybackService.java +++ b/src/ch/blinkenlights/android/vanilla/PlaybackService.java @@ -1642,6 +1642,8 @@ public final class PlaybackService extends Service */ public void emptyQueue() { + pause(); + setFlag(FLAG_EMPTY_QUEUE); mTimeline.emptyQueue(); } diff --git a/src/ch/blinkenlights/android/vanilla/SongTimeline.java b/src/ch/blinkenlights/android/vanilla/SongTimeline.java index 6123a468..d7559bcd 100644 --- a/src/ch/blinkenlights/android/vanilla/SongTimeline.java +++ b/src/ch/blinkenlights/android/vanilla/SongTimeline.java @@ -774,15 +774,12 @@ public final class SongTimeline { public void clearQueue() { synchronized (this) { + saveActiveSongs(); if (mCurrentPos + 1 < mSongs.size()) mSongs.subList(mCurrentPos + 1, mSongs.size()).clear(); } - if (mCallback != null) { - mCallback.activeSongReplaced(+1, getSong(+1)); - mCallback.positionInfoChanged(); - } - + broadcastChangedSongs(); changed(); } @@ -792,14 +789,11 @@ public final class SongTimeline { public void emptyQueue() { synchronized (this) { + saveActiveSongs(); mSongs.clear(); } - if (mCallback != null) { - mCallback.activeSongReplaced(+1, getSong(+1)); - mCallback.positionInfoChanged(); - } - + broadcastChangedSongs(); changed(); }