Merge lp:~vthompson/music-app/remix-remember-queue into lp:music-app/remix

[Victor Thompson]

Intial changes to remember the previous queue when restarting the app

Every other music app I've used persists the previous queue each time the app is launched. I think having a similar feature is pretty important for RTM, however, I know that we didn't want to have to rely on LocalStorage to do this. I think providing the functionality now would be better than waiting for the a better solution later.

[lp:~vthompson/music-app/remix-remember-queue]

677. By Victor Thompson on 2014-10-19

Remove commented out code

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:677
http://91.189.93.70:8080/job/music-app-remix-ci/107/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1038
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1038/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/107

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/107/rebuild

review: Approve (continuous-integration)

[lp:~vthompson/music-app/remix-remember-queue]

678. By Victor Thompson on 2014-10-19

Small update to index values

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:678
http://91.189.93.70:8080/job/music-app-remix-ci/108/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1039
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1039/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/108

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/108/rebuild

review: Approve (continuous-integration)

[lp:~vthompson/music-app/remix-remember-queue]

679. By Victor Thompson on 2014-10-20

Improve performance slightly

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:679
http://91.189.93.70:8080/job/music-app-remix-ci/111/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1050
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1050/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/111

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/111/rebuild

review: Needs Fixing (continuous-integration)

[lp:~vthompson/music-app/remix-remember-queue]

680. By Victor Thompson on 2014-10-20

Small fix to ListItemAction

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:680
http://91.189.93.70:8080/job/music-app-remix-ci/114/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1056
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1056/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/114

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/114/rebuild

review: Approve (continuous-integration)

[lp:~vthompson/music-app/remix-remember-queue]

681. By Victor Thompson on 2014-10-23

Resolve conflicts and change tab selection detection

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:681
http://91.189.93.70:8080/job/music-app-remix-ci/154/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1212
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1212/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/154

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/154/rebuild

review: Approve (continuous-integration)

[lp:~vthompson/music-app/remix-remember-queue]

682. By Victor Thompson on 2014-10-24

Improve performance

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:682
http://91.189.93.70:8080/job/music-app-remix-ci/160/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1239
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1239/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/160

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/160/rebuild

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

1 inline comment and can it remember the previous index as well?

review: Needs Fixing

[Andrew Hayzen (ahayzen)]

If you clear the queue and restart the app it remembers your queue you cleared.

[Andrew Hayzen (ahayzen)]

Even deleting one or many tracks from the queue causes them to be restored.

[lp:~vthompson/music-app/remix-remember-queue]

683. By Victor Thompson on 2014-10-24

Removed head actions from MusicNowPlaying and add initial recall of queue index

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:683
http://91.189.93.70:8080/job/music-app-remix-ci/171/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1281/console
    FAILURE: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/171/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/171/rebuild

review: Needs Fixing (continuous-integration)

[lp:~vthompson/music-app/remix-remember-queue]

684. By Victor Thompson on 2014-10-25

Change order of setting currentIndex and source to get things working

685. By Victor Thompson on 2014-10-25

merge of remix and resolve conflict

686. By Victor Thompson on 2014-10-25

Resolve removing item and clearning queue.

687. By Victor Thompson on 2014-10-25

Update index on reorder

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:685
http://91.189.93.70:8080/job/music-app-remix-ci/172/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1282
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1282/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/172

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/172/rebuild

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:687
http://91.189.93.70:8080/job/music-app-remix-ci/174/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1284
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1284/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/174

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/174/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

The currentIndex sometimes isn't maintained, eg select an item in the queue and the restart.

I suggest using something like the following to track the queueindex, instead of setting it in multiple places.

Connections {
   target: player
   onCurrentIndexChanged: startupSettings.queueIndex = player.currentIndex
}

review: Needs Fixing

[lp:~vthompson/music-app/remix-remember-queue]

688. By Victor Thompson on 2014-10-25

Fix for clicking on queue items

[Victor Thompson (vthompson)]

I made an attempt to use a similar Connections component to track changes to 'queueIndex', however, it didn't seem to work the way I wanted it to. I'll take another look into doing so shortly, but I think I now have each case covered.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:688
http://91.189.93.70:8080/job/music-app-remix-ci/175/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1290
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1290/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/175

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/175/rebuild

review: Needs Fixing (continuous-integration)

[lp:~vthompson/music-app/remix-remember-queue]

689. By Victor Thompson on 2014-10-27

merge of remix and resolve conflicts

690. By Victor Thompson on 2014-10-27

Use Player.setSource()

691. By Victor Thompson on 2014-10-27

Fix bad conflict resolution

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:690
http://91.189.93.70:8080/job/music-app-remix-ci/182/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1304
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1304/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/182

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/182/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:691
http://91.189.93.70:8080/job/music-app-remix-ci/183/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1305
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1305/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/183

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/183/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

This looks good assuming that this [0] mp can be approved and landed at the same time, as it has further fixes and performance tweaks. Therefore please ensure the other mp is approved before landing this and then land them together :)

0 - https://code.launchpad.net/~andrew-hayzen/music-app/remix-remember-queue-use-worker/+merge/239761

review: Approve

[Andrew Hayzen (ahayzen)]

Reordering does not persist, looks like there should be a call to Library.moveQueueItem in the onReorder inside the queue

review: Needs Fixing

[lp:~vthompson/music-app/remix-remember-queue]

692. By Victor Thompson on 2014-10-27

Update change for reorder.

[Andrew Hayzen (ahayzen)]

Reordering now working \o/ As stated in the other comment we are waiting for the other mp [0] to be approved with this one.

0 - https://code.launchpad.net/~andrew-hayzen/music-app/remix-remember-queue-use-worker/+merge/239761

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:692
http://91.189.93.70:8080/job/music-app-remix-ci/188/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1310
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1310/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/188

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/188/rebuild

review: Approve (continuous-integration)

[lp:~vthompson/music-app/remix-remember-queue]

693. By Victor Thompson on 2014-10-27

Fix add to queue listitem action

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:693
http://91.189.93.70:8080/job/music-app-remix-ci/189/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1311
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1311/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/189

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/189/rebuild

review: Approve (continuous-integration)

[lp:~vthompson/music-app/remix-remember-queue]

694. By Victor Thompson on 2014-10-28

Use append method to reduce the number of places addQueueItem needs to go

695. By Victor Thompson on 2014-10-28

update fix for performance

696. By Victor Thompson on 2014-10-28

Use a clear function to minimize impacts of clearQueue()

697. By Victor Thompson on 2014-10-28

Missed one case...

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:694
http://91.189.93.70:8080/job/music-app-remix-ci/191/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1313
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1313/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/191

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/191/rebuild

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:697
http://91.189.93.70:8080/job/music-app-remix-ci/192/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1314
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1314/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/192

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/192/rebuild

review: Needs Fixing (continuous-integration)

[lp:~vthompson/music-app/remix-remember-queue]

698. By Victor Thompson on 2014-10-28

Fix remove case

699. By Victor Thompson on 2014-10-28

Fix remove index change

700. By Victor Thompson on 2014-10-28

Revert small change

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:698
http://91.189.93.70:8080/job/music-app-remix-ci/195/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1317
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1317/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/195

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/195/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Finally! lol LGTM :)

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:700
http://91.189.93.70:8080/job/music-app-remix-ci/197/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1319
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1319/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/197

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/197/rebuild

review: Approve (continuous-integration)

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-10-26 21:39:08 +0000
+++ MusicNowPlaying.qml	2014-10-28 00:57:21 +0000
@@ -24,6 +24,7 @@
 import Ubuntu.Thumbnailer 0.1
 import "common"
 import "common/ListItemActions"
+import "meta-database.js" as Library
 import "playlists.js" as Playlists
 
 MusicPage {
@@ -123,7 +124,7 @@
                     visible: isListView
                     onTriggered: {
                         head.backAction.trigger()
-                        trackQueue.model.clear()
+                        trackQueue.clear()
                     }
                 }
             ]
@@ -507,10 +508,12 @@
         }
 
         trackQueue.model.remove(index);
+        Library.removeQueueItem(removedIndex);
 
         if (removedIndex < player.currentIndex) {
             // update index as the old has been removed
             player.currentIndex -= 1;
+            queueIndex -= 1;
         }
     }
 
@@ -598,7 +601,7 @@
                         console.debug("Move: ", from, to);
 
                         trackQueue.model.move(from, to, 1);
-
+                        Library.moveQueueItem(from, to);
 
                         // Maintain currentIndex with current song
                         if (from === player.currentIndex) {
@@ -610,6 +613,8 @@
                         else if (from > player.currentIndex && to <= player.currentIndex) {
                             player.currentIndex += 1;
                         }
+
+                        queueIndex = player.currentIndex
                     }
 
                     Item {

=== modified file 'MusicTracks.qml'
--- MusicTracks.qml	2014-10-26 16:18:12 +0000
+++ MusicTracks.qml	2014-10-28 00:57:21 +0000
@@ -84,7 +84,7 @@
                     text: i18n.tr("Add to queue")
                     onTriggered: {
                         for (var i=0; i < tracklist.selectedItems.length; i++) {
-                            trackQueue.model.append(makeDict(tracklist.model.get(tracklist.selectedItems[i], tracklist.model.RoleModelData)));
+                            trackQueue.append(makeDict(tracklist.model.get(tracklist.selectedItems[i], tracklist.model.RoleModelData)));
                         }
 
                         tracklist.closeSelection()

=== modified file 'Player.qml'
--- Player.qml	2014-10-26 16:18:12 +0000
+++ Player.qml	2014-10-28 00:57:21 +0000
@@ -125,6 +125,9 @@
             currentIndex = newIndex
             source = Qt.resolvedUrl(trackQueue.model.get(newIndex).filename)
         }
+
+        // Set index into queue
+        queueIndex = currentIndex
     }
 
     function nextSong(startPlaying, fromControls) {
@@ -142,6 +145,7 @@
     function playSong(filepath, index) {
         stop();
         currentIndex = index;
+        queueIndex = index;
         setSource(filepath);
         play();
     }

=== modified file 'common/ListItemActions/AddToQueue.qml'
--- common/ListItemActions/AddToQueue.qml	2014-09-20 10:50:45 +0000
+++ common/ListItemActions/AddToQueue.qml	2014-10-28 00:57:21 +0000
@@ -17,7 +17,9 @@
  */
 
 import QtQuick 2.3
+import QtQuick.LocalStorage 2.0
 import Ubuntu.Components 1.1
+import "../../meta-database.js" as Library
 
 Action {
     iconName: "add"

=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2014-10-26 16:18:12 +0000
+++ common/SongsPage.qml	2014-10-28 00:57:21 +0000
@@ -132,7 +132,7 @@
                     text: i18n.tr("Add to queue")
                     onTriggered: {
                         for (var i=0; i < albumtrackslist.selectedItems.length; i++) {
-                            trackQueue.model.append(makeDict(albumtrackslist.model.get(albumtrackslist.selectedItems[i], albumtrackslist.model.RoleModelData)));
+                            trackQueue.append(makeDict(albumtrackslist.model.get(albumtrackslist.selectedItems[i], albumtrackslist.model.RoleModelData)));
                         }
 
                         albumtrackslist.closeSelection()

=== modified file 'meta-database.js'
--- meta-database.js	2014-10-18 03:49:51 +0000
+++ meta-database.js	2014-10-28 00:57:21 +0000
@@ -32,7 +32,139 @@
             tx.executeSql('DROP TABLE IF EXISTS metadata');  // TODO: drop recent as well to reset data
 
             createRecent();
-      });
+            createQueue();
+      });
+}
+
+function createQueue() {
+    var db = getDatabase();
+    db.transaction(
+        function(tx) {
+            tx.executeSql("CREATE TABLE IF NOT EXISTS queue(ind INTEGER NOT NULL, filename TEXT)");
+      });
+}
+
+function clearQueue() {
+    var db = getDatabase();
+    db.transaction(
+        function(tx) {
+            tx.executeSql('DROP TABLE IF EXISTS queue');
+            tx.executeSql("CREATE TABLE IF NOT EXISTS queue(ind INTEGER NOT NULL, filename TEXT)");
+      });
+}
+
+function addQueueItem(ind,filename) {
+    var db = getDatabase();
+    var res="";
+
+    db.transaction(function(tx) {
+        var rs = tx.executeSql('INSERT OR REPLACE INTO queue (ind, filename) VALUES (?,?);', [ind, filename]);
+              if (rs.rowsAffected > 0) {
+                console.log("QUEUE add OK")
+                res = "OK";
+              } else {
+                console.log("QUEUE add Fail")
+                res = "Error";
+              }
+        }
+    );
+}
+
+function addQueueList(model) {
+    var db = getDatabase();
+    var res="";
+
+    db.transaction(function(tx) {
+
+        for (var i = 0; i < model.count; i++) {
+            var rs = tx.executeSql('INSERT OR REPLACE INTO queue (ind, filename) VALUES (?,?);', [i, model.get(i).filename]);
+            if (rs.rowsAffected > 0) {
+                res = "OK";
+            } else {
+                res = "Error";
+            }
+        }
+    }
+    );
+}
+
+function moveQueueItem(from, to) {
+    var db = getDatabase();
+    var res="";
+
+    db.transaction(function(tx) {
+
+        // Generate new index number if records exist, otherwise use 0
+        var rs = tx.executeSql('SELECT MAX(ind) FROM queue')
+
+        var nextIndex = isNaN(rs.rows.item(0)["MAX(ind)"]) ? 0 : rs.rows.item(
+                                                                   0)["MAX(ind)"] + 1
+
+        tx.executeSql('UPDATE queue SET ind=? WHERE ind=?;',
+                      [nextIndex, from])
+
+        if (from > to) {
+            for (var i = from-1; i >= to; i--) {
+                tx.executeSql('UPDATE queue SET ind=? WHERE ind=?;',
+                              [i+1, i])
+            }
+        } else {
+            for (var j = from+1; j <= to; j++) {
+                tx.executeSql('UPDATE queue SET ind=? WHERE ind=?;',
+                              [j-1, j])
+            }
+        }
+
+        tx.executeSql('UPDATE queue SET ind=? WHERE ind=?;',
+                      [to, nextIndex])
+
+    })
+}
+
+function removeQueueItem(ind) {
+    var db = getDatabase()
+    var res = false
+
+    db.transaction(function (tx) {
+        tx.executeSql('DELETE FROM queue WHERE ind=?;', [ind])
+
+        var rs = tx.executeSql('SELECT MAX(ind) FROM queue')
+
+        var lastIndex = isNaN(rs.rows.item(0)["MAX(ind)"]) ? 0 : rs.rows.item(
+                                                           0)["MAX(ind)"]
+        for(var i = ind+1; i <= lastIndex; i++) {
+            tx.executeSql('UPDATE queue SET ind=? WHERE ind=?;',
+                          [i-1, i])
+        }
+    })
+
+    return res
+}
+
+
+function getQueue() {
+    var res = [];
+    var db = getDatabase();
+    db.transaction( function(tx) {
+        var rs = tx.executeSql("SELECT * FROM queue ORDER BY ind ASC");
+        for(var i = 0; i < rs.rows.length; i++) {
+            var dbItem = rs.rows.item(i);
+            res.push({filename:dbItem.filename});
+        }
+    });
+    return res;
+}
+
+function isQueueEmpty() {
+    var db = getDatabase();
+    var res = 0;
+
+    db.transaction( function(tx) {
+        createQueue();
+        var rs = tx.executeSql("SELECT count(*) as value FROM queue")
+        res = rs.rows.item(0).value === 0
+    });
+    return res
 }
 
 function createRecent() {

=== modified file 'music-app.qml'
--- music-app.qml	2014-10-26 21:39:08 +0000
+++ music-app.qml	2014-10-28 00:57:21 +0000
@@ -23,6 +23,7 @@
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Content 0.1
 import Ubuntu.MediaScanner 0.1
+import Qt.labs.settings 1.0
 import QtMultimedia 5.0
 import QtQuick.LocalStorage 2.0
 import QtGraphicalEffects 1.0
@@ -40,6 +41,14 @@
     backgroundColor: "#1e1e23"
     headerColor: "#1e1e23"
 
+    // Startup settings
+    Settings {
+        id: startupSettings
+        category: "StartupSettings"
+
+        property int queueIndex: 0
+    }
+
     // Global keyboard shortcuts
     focus: true
     Keys.onPressed: {
@@ -213,7 +222,7 @@
 
             if (play) {
                 // clear play queue
-                trackQueue.model.clear()
+                trackQueue.clear()
             }
 
             // enqueue
@@ -414,7 +423,7 @@
             else {
                 stopTimer();
 
-                trackQueue.model.clear();
+                trackQueue.clear();
 
                 for (i=0; i < searchPaths.length; i++) {
                     model = musicStore.lookup(searchPaths[i])
@@ -533,6 +542,25 @@
 
         Library.initialize();
 
+        // Load previous queue
+        if (!Library.isQueueEmpty()) {
+            var queue = Library.getQueue()
+            for (var i = 0; i < queue.length; i++) {
+                trackQueue.model.append({
+                                            album:musicStore.lookup(queue[i].filename).album,
+                                            art:musicStore.lookup(queue[i].filename).art,
+                                            author:musicStore.lookup(queue[i].filename).author,
+                                            filename:queue[i].filename,
+                                            title:musicStore.lookup(queue[i].filename).title
+                                        })
+            }
+
+            if (queue.length > queueIndex) {
+                player.currentIndex = queueIndex
+                player.setSource(queue[queueIndex].filename)
+            }
+        }
+
         // initialize playlists
         Playlists.initializePlaylist()
 
@@ -544,12 +572,8 @@
 
         loadedUI = true;
 
-        // TODO: Switch tabs back and forth to get the background color in the
-        //       header to work properly.
-        tabs.selectedTabIndex = 1
-
         // goto Recent if there are items otherwise go to Albums
-        tabs.selectedTabIndex = Library.isRecentEmpty() ? 2 : 0
+        tabs.selectedTabIndex = Library.isRecentEmpty() ? albumsTab.index : startTab.index
 
         // Run post load
         tabs.ensurePopulated(tabs.selectedTab);
@@ -564,6 +588,7 @@
     property string appVersion: '1.2'
     property bool toolbarShown: musicToolbar.visible
     property bool selectedAlbum: false
+    property alias queueIndex: startupSettings.queueIndex
 
     signal listItemSwiping(int i)
 
@@ -589,8 +614,11 @@
         }
 
         for (var i=0; i < model.rowCount; i++) {
-            trackQueue.model.append(makeDict(model.get(i, model.RoleModelData)));
+            trackQueue.model.append(model.get(i, model.RoleModelData));
         }
+
+        // Add model to queue storage
+        Library.addQueueList(trackQueue.model);
     }
 
     // Converts an duration in ms to a formated string ("minutes:seconds")
@@ -637,7 +665,7 @@
             }
         }
 
-        trackQueue.model.clear();  // clear the old model
+        trackQueue.clear();  // clear the old model
 
         addQueueFromModel(model);
 
@@ -668,7 +696,7 @@
 
     function playRandomSong(shuffle)
     {
-        trackQueue.model.clear();
+        trackQueue.clear();
 
         var now = new Date();
         var seed = now.getSeconds();
@@ -766,7 +794,13 @@
         function append(listElement)
         {
             model.append(makeDict(listElement))
-            console.debug(JSON.stringify(makeDict(listElement)));
+            Library.addQueueItem(trackQueue.model.count,listElement.filename)
+        }
+
+        function clear()
+        {
+            model.clear()
+            Library.clearQueue()
         }
     }
 
@@ -1080,7 +1114,7 @@
                 topMargin: -emptyPage.header.height
             }
             color: mainView.backgroundColor
-            visible: emptyPage.noPlaylists && !emptyPage.noMusic && tabs.selectedTab.index === 4
+            visible: emptyPage.noPlaylists && !emptyPage.noMusic && playlistTab.index === tabs.selectedTab.index
 
             Column {
                 anchors.centerIn: parent
@@ -1110,7 +1144,7 @@
                 topMargin: -emptyPage.header.height
             }
             color: mainView.backgroundColor
-            visible: emptyPage.noRecent && !emptyPage.noMusic && tabs.selectedTab.index === 0
+            visible: emptyPage.noRecent && !emptyPage.noMusic && startTab.index === tabs.selectedTab.index
 
             Column {
                 anchors.centerIn: parent