Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6096a26 authored by linus_lee's avatar linus_lee
Browse files

Eleven: Fix Play next to work as expected 

https://cyanogen.atlassian.net/browse/MUSIC-66
https://cyanogen.atlassian.net/browse/MUSIC-156

Change-Id: Ia3f7305ccdc7811246f205f52c739e60d408a4ed
parent 9dcf86bf

src/com/cyngn/eleven/MusicPlaybackService.java

+19 −14
Original line number Diff line number Diff line
@@ -211,11 +211,6 @@ public class MusicPlaybackService extends Service { 


    private static final int IDCOLIDX = 0;



    /**

     * Moves a list to the front of the queue

     */

    public static final int NOW = 1;



    /**

     * Moves a list to the next position in the queue

     */
@@ -306,6 +301,8 @@ public class MusicPlaybackService extends Service { 
    /**

     * The max size allowed for the track history

     * TODO: Comeback and rewrite/fix all the whole queue code bugs after demo

     * https://cyanogen.atlassian.net/browse/MUSIC-175

     * https://cyanogen.atlassian.net/browse/MUSIC-44

     */

    public static final int MAX_HISTORY_SIZE = 1000;
@@ -1017,10 +1014,13 @@ public class MusicPlaybackService extends Service { 
            position = mPlaylist.size();

        }



        final ArrayList<MusicPlaybackTrack> arrayList = new ArrayList<MusicPlaybackTrack>(addlen);

        for (int i = 0; i < list.length; i++) {

            mPlaylist.add(new MusicPlaybackTrack(list[i], sourceId, sourceType, i));

            arrayList.add(new MusicPlaybackTrack(list[i], sourceId, sourceType, i));

        }



        mPlaylist.addAll(position, arrayList);



        if (mPlaylist.size() == 0) {

            closeCursor();

            notifyChange(META_CHANGED);
@@ -1387,8 +1387,18 @@ public class MusicPlaybackService extends Service { 
        } else if (what.equals(QUEUE_CHANGED)) {

            saveQueue(true);

            if (isPlaying()) {

                // if we are in shuffle mode and our next track is still valid,

                // try to re-use the track

                // We need to reimplement the queue to prevent hacky solutions like this

                // https://cyanogen.atlassian.net/browse/MUSIC-175

                // https://cyanogen.atlassian.net/browse/MUSIC-44

                if (mNextPlayPos >= 0 && mNextPlayPos < mPlaylist.size()

                        && getShuffleMode() != SHUFFLE_NONE) {

                    setNextTrack(mNextPlayPos);

                } else {

                    setNextTrack();

                }

            }

        } else {

            saveQueue(false);

        }
@@ -2411,18 +2421,13 @@ public class MusicPlaybackService extends Service { 
        synchronized (this) {

            if (action == NEXT && mPlayPos + 1 < mPlaylist.size()) {

                addToPlayList(list, mPlayPos + 1, sourceId, sourceType);

                mNextPlayPos = mPlayPos + 1;

                notifyChange(QUEUE_CHANGED);

            } else {

                addToPlayList(list, Integer.MAX_VALUE, sourceId, sourceType);

                notifyChange(QUEUE_CHANGED);

                if (action == NOW) {

                    mPlayPos = mPlaylist.size() - list.length;

                    openCurrentAndNext();

                    play();

                    notifyChange(META_CHANGED);

                    return;

                }

            }



            if (mPlayPos < 0) {

                mPlayPos = 0;

                openCurrentAndNext();