Merge lp:~ahayzen/music-app/trackqueue-speedup into lp:music-app/trusty

[Andrew Hayzen]

* Use worker loaded trackQueueUI infront of trackQueue

* Use worker loaded trackQueueUI infront of trackQueue

BEFORE
* Go to a listview with many items (eg Songs tab) scroll to the bottom
* Select a track near the bottom
* Notice the UI freezes and there is noticeable lag until audio starts playing

AFTER
* Go to a listview with many items (eg Songs tab) scroll to the bottom
* Select a track near the bottom
* Notice the audio starts much faster and the UI is loaded as the data appears from the worker script, making it 'feel' more responsive

Note I had 300+ tracks in the Songs tab and this branch had a very positive affect on the performance, but it is also noticeable when selecting the last track in an album of 10+ tracks.

The performance increase is done by having two models for the trackQueue, one to hold the data that is always 'insync' (required for calculations of eg nextSong() etc) and another that is for the UI that loads items via the worker script as they appear into the first.

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

FAILED: Continuous integration, rev:565
http://91.189.93.70:8080/job/music-app-ci/1073/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1685/console
    FAILURE: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/297/console

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/trackqueue-speedup]

566. By Andrew Hayzen on 2014-08-24

* Merge of trunk

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

FAILED: Continuous integration, rev:566
http://91.189.93.70:8080/job/music-app-ci/1074/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1686
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1686/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/298

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

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

I'm not sure this is working the way you intended it to. It doesn't really seem to speed things up consistently. I tried it once and it seemed to maybe be half a second faster, but it delayed jumping to the now playing item. Then I tried it again and recorded it. The N4 is running this branch and the N7 is running trunk. Note that the N4 is actually started first by a bit, and note how large the delay is until the now playing item is shown.

http://youtu.be/43IZ7jI5QbY

[Victor Thompson (vthompson)]

Also note that this is with 841 tracks on each device.

[Andrew Hayzen (ahayzen)]

I would expect the UI to be slower in certain situations, but I would expect the time until the audio starts to be faster. I'll see if I can tweak the UI loading to speed it up.

Unmerged revisions

566. By Andrew Hayzen on 2014-08-24

* Merge of trunk

565. By Andrew Hayzen on 2014-08-24

* Use worker loaded trackQueueUI infront of trackQueue

564. By Andrew Hayzen on 2014-08-12

* Disable trackQueue from now playing page

=== modified file 'LibraryListModel.qml'
--- LibraryListModel.qml	2014-08-20 17:35:52 +0000
+++ LibraryListModel.qml	2014-08-24 23:27:56 +0000
@@ -34,6 +34,10 @@
     property bool canLoad: true
     property bool preLoadComplete: false
 
+    property alias onlyAppend: worker.onlyAppend
+    property alias list: worker.list
+    property alias workerCompleted: worker.completed
+
     onCanLoadChanged: {
         /* If canLoad has been set back to true then check if there are any
           remaining items to load in the model */
@@ -58,9 +62,19 @@
          property int i: 0
          property var list: null
 
+         property bool onlyAppend: false
+
          onListChanged: {
-             reset();
-             clear();
+             if (onlyAppend) {
+                 if (canLoad) {
+                     process()
+                 }
+
+                 onlyAppend = false
+             } else {
+                 reset();
+                 clear();
+             }
          }
 
          onMessage: {

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-08-20 17:35:52 +0000
+++ MusicNowPlaying.qml	2014-08-24 23:27:56 +0000
@@ -55,8 +55,6 @@
                 return;
             }
 
-            queuelist.currentIndex = player.currentIndex;
-
             customdebug("MusicQueue update currentIndex: " + player.source);
 
             // Always jump to current track
@@ -70,14 +68,24 @@
         // If the toolbar is shown, the page is now playing and snaptrack is enabled
         if (shown && currentPage === nowPlaying && Settings.getSetting("snaptrack") === "1")
         {
-            // Then position the view at the current index
-            queuelist.positionViewAtIndex(queuelist.currentIndex, ListView.Beginning);
+
+            // Only jump if the item has been created otherwise jump on load
+            if (queuelist.count >= player.currentIndex && trackQueueUI.workerCompleted) {
+                // Then position the view at the current index
+                queuelist.positionViewAtIndex(player.currentIndex, ListView.Beginning);
+            } else {
+                queuelist.jumpOnLoad = player.currentIndex
+            }
         }
     }
 
     function positionAt(index) {
-        queuelist.positionViewAtIndex(index, ListView.Beginning);
-        queuelist.contentY -= header.height;
+        if (queuelist.count >= index && trackQueueUI.workerCompleted) {
+            queuelist.positionViewAtIndex(index, ListView.Beginning);
+            queuelist.contentY -= header.height;
+        } else {
+            queuelist.jumpOnLoad = index
+        }
     }
 
     ListView {
@@ -86,7 +94,7 @@
         anchors.fill: parent
         anchors.bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
         delegate: queueDelegate
-        model: trackQueue.model
+        model: trackQueueUI.model
         highlightFollowsCurrentItem: false
         state: "normal"
         states: [
@@ -113,21 +121,39 @@
         property int currentHeight: units.gu(40)
         property int transitionDuration: 250  // transition length of animations
 
+        property int jumpOnLoad: -1
+
         onCountChanged: {
-            customdebug("Queue: Now has: " + queuelist.count + " tracks")
+            customdebug("Queue: Now has: " + queuelist.count + " tracks" + " " + jumpOnLoad)
+
+            if (jumpOnLoad < count && jumpOnLoad !== -1) {  // < due to count being +1 to index
+                positionAtAfterDelay.start()
+            }
         }
 
         onMovementStarted: {
             musicToolbar.hideToolbar();
         }
 
+        Timer {
+            id: positionAtAfterDelay
+            interval: 250
+            repeat: false
+            onTriggered: {
+                // Then position the view at the current index
+                queuelist.positionViewAtIndex(queuelist.jumpOnLoad, ListView.Beginning);
+
+                queuelist.jumpOnLoad = -1
+            }
+        }
+
         Component {
             id: queueDelegate
             ListItemWithActions {
                 id: queueListItem
                 color: "transparent"
                 height: queuelist.normalHeight
-                state: queuelist.currentIndex == index && !reordering ? "current" : ""
+                state: player.currentIndex == index && !reordering ? "current" : ""
 
                 leftSideAction: Remove {
                     onTriggered: {
@@ -143,7 +169,7 @@
                             player.currentIndex -= 1;
                         }
 
-                        queuelist.model.remove(index);
+                        trackQueueUI.remove(index);
                     }
                 }
                 reorderable: true
@@ -161,8 +187,7 @@
                 onReorder: {
                     console.debug("Move: ", from, to);
 
-                    queuelist.model.move(from, to, 1);
-
+                    trackQueueUI.move(from, to, 1);
 
                     // Maintain currentIndex with current song
                     if (from === player.currentIndex) {

=== modified file 'MusicSearch.qml'
--- MusicSearch.qml	2014-08-21 19:32:12 +0000
+++ MusicSearch.qml	2014-08-24 23:27:56 +0000
@@ -173,8 +173,8 @@
                             onItemClicked: {
                                 console.debug("Debug: "+title+" added to queue")
                                 // now play this track, but keep current queue
-                                trackQueue.append(model)
-                                trackQueueClick(trackQueue.model.count - 1);
+                                trackQueue.appendItem(makeDict(model))
+                                trackQueueClick(trackQueue.count - 1);
                                 onDoneClicked: PopupUtils.close(searchTrack)
                             }
 

=== modified file 'MusicToolbar.qml'
--- MusicToolbar.qml	2014-08-21 19:32:12 +0000
+++ MusicToolbar.qml	2014-08-24 23:27:56 +0000
@@ -223,7 +223,7 @@
 
                     /* Clicking in the area shows the queue */
                     function trigger() {
-                        if (trackQueue.model.count !== 0 && currentPage !== nowPlaying) {
+                        if (trackQueue.count !== 0 && currentPage !== nowPlaying) {
                             tabs.pushNowPlaying();
                         }
                         else if (currentPage === nowPlaying) {
@@ -244,7 +244,7 @@
                         elide: Text.ElideRight
                         fontSize: "medium"
                         objectName: "playercontroltitle"
-                        text: trackQueue.model.count === 0 ? "" : player.currentMetaTitle === "" ? player.currentMetaFile : player.currentMetaTitle
+                        text: trackQueue.count === 0 ? "" : player.currentMetaTitle === "" ? player.currentMetaFile : player.currentMetaTitle
                     }
 
                     /* Artist of track */
@@ -259,7 +259,7 @@
                         color: styleMusic.playerControls.labelColor
                         elide: Text.ElideRight
                         fontSize: "small"
-                        text: trackQueue.model.count === 0 ? "" : player.currentMetaArtist
+                        text: trackQueue.count === 0 ? "" : player.currentMetaArtist
                     }
 
                     /* Album of track */
@@ -274,7 +274,7 @@
                         color: styleMusic.playerControls.labelColor
                         elide: Text.ElideRight
                         fontSize: "small"
-                        text: trackQueue.model.count === 0 ? "" : player.currentMetaAlbum
+                        text: trackQueue.count === 0 ? "" : player.currentMetaAlbum
                     }
                 }
 
@@ -318,11 +318,11 @@
                     anchors.verticalCenter: parent.verticalCenter
                     height: units.gu(6)
                     objectName: "previousshape"
-                    opacity: trackQueue.model.count === 0  ? .4 : 1
+                    opacity: trackQueue.count === 0  ? .4 : 1
                     width: height
 
                     function trigger() {
-                        if (trackQueue.model.count === 0) {
+                        if (trackQueue.count === 0) {
                             return;
                         }
 
@@ -409,7 +409,7 @@
                                                 return;
                                             }
 
-                                            if (trackQueue.model.count === 0) {
+                                            if (trackQueue.count === 0) {
                                                 playRandomSong();
                                             }
                                             else {
@@ -442,11 +442,11 @@
                     anchors.verticalCenter: parent.verticalCenter
                     height: units.gu(6)
                     objectName: "forwardshape"
-                    opacity: trackQueue.model.count === 0 ? .4 : 1
+                    opacity: trackQueue.count === 0 ? .4 : 1
                     width: height
 
                     function trigger() {
-                        if (trackQueue.model.count === 0 || emptyPage.noMusic) {
+                        if (trackQueue.count === 0 || emptyPage.noMusic) {
                             return;
                         }
 
@@ -569,7 +569,7 @@
                     anchors.verticalCenter: parent.verticalCenter
                     color: "transparent"
                     height: units.gu(1);
-                    state: trackQueue.model.count === 0 ? "disabled" : "enabled"
+                    state: trackQueue.count === 0 ? "disabled" : "enabled"
 
                     states: [
                         State {
@@ -716,7 +716,7 @@
                 id: musicToolbarPlayerControls
                 anchors.fill: parent
                 color: styleMusic.playerControls.backgroundColor
-                state: trackQueue.model.count === 0 ? "disabled" : "enabled"
+                state: trackQueue.count === 0 ? "disabled" : "enabled"
                 states: [
                     State {
                         name: "disabled"
@@ -746,7 +746,7 @@
                     id: disabledPlayerControlsGroup
                     anchors.fill: parent
                     color: "transparent"
-                    visible: trackQueue.model.count === 0
+                    visible: trackQueue.count === 0
 
                     Label {
                         id: noSongsInQueueLabel
@@ -779,7 +779,7 @@
                                 return;
                             }
 
-                            if (trackQueue.model.count === 0) {
+                            if (trackQueue.count === 0) {
                                 playRandomSong();
                             }
                             else {
@@ -861,7 +861,7 @@
                     id: enabledPlayerControlsGroup
                     anchors.fill: parent
                     color: "transparent"
-                    visible: trackQueue.model.count !== 0
+                    visible: trackQueue.count !== 0
 
                     /* Settings button */
                     // TODO: Enable settings when it is practical
@@ -911,7 +911,7 @@
                                 return;
                             }
 
-                            if (trackQueue.model.count === 0) {
+                            if (trackQueue.count === 0) {
                                 playRandomSong();
                             }
                             else {

=== modified file 'Player.qml'
--- Player.qml	2014-08-22 00:26:30 +0000
+++ Player.qml	2014-08-24 23:27:56 +0000
@@ -59,12 +59,12 @@
     }
 
     Connections {
-        target: trackQueue.model
+        target: trackQueue
         onCountChanged: {
-            if (trackQueue.model.count === 1) {
+            if (trackQueue.count === 1) {
                 player.currentIndex = 0;
-                player.source = Qt.resolvedUrl(trackQueue.model.get(0).filename)
-            } else if (trackQueue.model.count === 0) {
+                player.source = Qt.resolvedUrl(trackQueue.get(0).filename)
+            } else if (trackQueue.count === 0) {
                 player.currentMetaFile = ""
                 player.source = ""
             }
@@ -79,7 +79,7 @@
             return;
         }
 
-        if (trackQueue.model.count == 0)
+        if (trackQueue.count == 0)
         {
             customdebug("No tracks in queue.");
             return;
@@ -91,26 +91,26 @@
         var newIndex;
 
         console.log("currentIndex: " + currentIndex)
-        console.log("trackQueue.count: " + trackQueue.model.count)
+        console.log("trackQueue.count: " + trackQueue.count)
 
         // Do not shuffle if repeat is off and there is only one track in the queue
-        if (shuffle && !(trackQueue.model.count === 1 && !repeat)) {
+        if (shuffle && !(trackQueue.count === 1 && !repeat)) {
             var now = new Date();
             var seed = now.getSeconds();
 
             // trackQueue must be above 1 otherwise an infinite loop will occur
             do {
-                newIndex = (Math.floor((trackQueue.model.count)
+                newIndex = (Math.floor((trackQueue.count)
                                        * Math.random(seed)));
-            } while (newIndex === currentIndex && trackQueue.model.count > 1)
+            } while (newIndex === currentIndex && trackQueue.count > 1)
         } else {
-            if ((currentIndex < trackQueue.model.count - 1 && direction === 1 )
+            if ((currentIndex < trackQueue.count - 1 && direction === 1 )
                     || (currentIndex > 0 && direction === -1)) {
                 newIndex = currentIndex + direction
             } else if(direction === 1 && (repeat || fromControls)) {
                 newIndex = 0
             } else if(direction === -1 && (repeat || fromControls)) {
-                newIndex = trackQueue.model.count - 1
+                newIndex = trackQueue.count - 1
             }
             else
             {
@@ -120,11 +120,11 @@
         }
 
         if (startPlaying) {  // only start the track if told
-            playSong(trackQueue.model.get(newIndex).filename, newIndex)
+            playSong(trackQueue.get(newIndex).filename, newIndex)
         }
         else {
             currentIndex = newIndex
-            source = Qt.resolvedUrl(trackQueue.model.get(newIndex).filename)
+            source = Qt.resolvedUrl(trackQueue.get(newIndex).filename)
         }
     }
 
@@ -184,7 +184,7 @@
                 player.stop()
             }
             else {
-                var obj = trackQueue.model.get(player.currentIndex);
+                var obj = trackQueue.get(player.currentIndex);
                 currentMetaAlbum = obj.album;
                 currentMetaArtist = obj.author;
                 currentMetaFile = obj.filename;

=== modified file 'common/ListItemActions/AddToQueue.qml'
--- common/ListItemActions/AddToQueue.qml	2014-08-20 17:35:52 +0000
+++ common/ListItemActions/AddToQueue.qml	2014-08-24 23:27:56 +0000
@@ -26,6 +26,6 @@
 
     onTriggered: {
         console.debug("Debug: Add track to queue: " + model)
-        trackQueue.append(model)
+        trackQueue.appendItem(makeDict(model))
     }
 }

=== modified file 'music-app.qml'
--- music-app.qml	2014-08-22 00:26:30 +0000
+++ music-app.qml	2014-08-24 23:27:56 +0000
@@ -236,15 +236,15 @@
 
             if (play) {
                 // clear play queue
-                trackQueue.model.clear()
+                trackQueue.clearItems()
             }
 
             // enqueue
-            trackQueue.append(makeDict(track));
+            trackQueue.appendItem(makeDict(track));
 
             // play first URI
             if (play) {
-                trackQueueClick(trackQueue.model.count - 1);
+                trackQueueClick(trackQueue.count - 1);
             }
         }
 
@@ -394,7 +394,7 @@
             else {
                 stopTimer();
 
-                trackQueue.model.clear();
+                trackQueue.clearItems();
 
                 trackQueue.append(makeDict(model));
                 trackQueueClick(0);
@@ -637,9 +637,13 @@
             model = model.linkLibraryListModel;
         }
 
+        var list = []
+
         for (var i=0; i < model.rowCount; i++) {
-            trackQueue.model.append(makeDict(model.get(i, model.RoleModelData)));
+            list.push(makeDict(model.get(i, model.RoleModelData)));
         }
+
+        trackQueue.appendList(list)
     }
 
     // Converts an duration in ms to a formated string ("minutes:seconds")
@@ -679,14 +683,14 @@
         if (!clear) {
             // If same track and on now playing page then toggle
             if (musicToolbar.currentPage === nowPlaying &&
-                    trackQueue.model.get(player.currentIndex) !== undefined &&
-                    Qt.resolvedUrl(trackQueue.model.get(player.currentIndex).filename) === file) {
+                    trackQueue.get(player.currentIndex) !== undefined &&
+                    Qt.resolvedUrl(trackQueue.get(player.currentIndex).filename) === file) {
                 player.toggle()
                 return;
             }
         }
 
-        trackQueue.model.clear();  // clear the old model
+        trackQueue.clearItems();  // clear the old model
 
         addQueueFromModel(model);
 
@@ -709,7 +713,7 @@
             player.toggle();
         }
         else {
-            player.playSong(trackQueue.model.get(index).filename, index);
+            player.playSong(trackQueue.get(index).filename, index);
         }
 
         // Show the Now Playing page and make sure the track is visible
@@ -721,7 +725,7 @@
 
     function playRandomSong(shuffle)
     {
-        trackQueue.model.clear();
+        trackQueue.clearItems();
 
         var now = new Date();
         var seed = now.getSeconds();
@@ -853,13 +857,67 @@
     }
 
     // list of tracks on startup. This is just during development
-    LibraryListModel {
+    ListModel {
         id: trackQueue
 
-        function append(listElement)
-        {
-            model.append(makeDict(listElement))
-            console.debug(JSON.stringify(makeDict(listElement)));
+        /* Pretent to be like a mediascanner2 listmodel */
+        property alias rowCount: trackQueue.count
+
+        function appendItem(item) {
+            append(item)
+
+            trackQueueUI.liveList.push(item)
+            trackQueueUI.onlyAppend = true
+            trackQueueUI.list = trackQueueUI.liveList
+        }
+
+        function appendList(list)
+        {
+            for (var i=0; i < list.length; i++) {
+                append(list[i])
+            }
+
+            trackQueueUI.liveList = list
+            trackQueueUI.list = list
+
+            console.debug(JSON.stringify(list));
+        }
+
+        function clearItems()
+        {
+            clear()
+
+            trackQueueUI.clear()
+            trackQueueUI.liveList = []
+            trackQueueUI.list = []
+        }
+    }
+
+    LibraryListModel {
+        id: trackQueueUI
+        canLoad: true
+
+        property var liveList: null
+
+        function move(from, to, count)
+        {
+            trackQueue.move(from, to, count)
+            model.move(from, to, count)
+
+            // list.splice(to, 0, *list.splice(from, count))
+
+            var args = [to, 0];
+            args.push.apply(args, liveList.splice(from, count))
+
+            liveList.splice.apply(liveList, args)
+        }
+
+        function remove(index)
+        {
+            trackQueue.remove(index)
+            model.remove(index)
+
+            liveList.splice(index, 1)
         }
     }
 
@@ -910,7 +968,7 @@
                     onClicked: {
                         console.debug("Debug: Add track to queue: " + JSON.stringify(chosenElement))
                         PopupUtils.close(trackPopover)
-                        trackQueue.append(chosenElement)
+                        trackQueue.appendItem(makeDict(chosenElement))
                     }
                 }
                 ListItem.Standard {