Merge lp:~phablet-team/music-app/final-declarative-playlist-api into lp:~music-app-dev/music-app/media-hub-bg-playlists-rework

[Andrew Hayzen]

* Convert to new QDeclarativePlaylist QML API.

* Convert to new QDeclarativePlaylist QML API.

[lp:~phablet-team/music-app/final-declarative-playlist-api]

904. By Jim Hodapp on 2015-11-12

Restore queue functionality should work again.

905. By Jim Hodapp on 2015-11-12

Debug output for restoring play queue

906. By Jim Hodapp on 2015-11-12

Debug output for storing play queue

907. By Jim Hodapp on 2015-11-12

Updated play queue saving debug statements

908. By Jim Hodapp on 2015-11-12

Make sure save queue and restore queue work

909. By Jim Hodapp on 2015-11-12

Add queue restore error message

[Andrew Hayzen (ahayzen)]

1 inline comment so far....

1) This should be addSourcesFromModel (plural) ?

review: Needs Information

[lp:~phablet-team/music-app/final-declarative-playlist-api]

910. By Jim Hodapp on 2015-11-13

Fix function name.

[Andrew Hayzen (ahayzen)]

LGTM, we can fix any further issues in the other branch :-)

review: Approve

=== modified file 'app/components/HeadState/MultiSelectHeadState.qml'
--- app/components/HeadState/MultiSelectHeadState.qml	2015-11-02 15:58:44 +0000
+++ app/components/HeadState/MultiSelectHeadState.qml	2015-11-13 13:27:56 +0000
@@ -71,7 +71,7 @@
                     sources.push(Qt.resolvedUrl(listview.model.get(indicies[i], listview.model.RoleModelData).filename));
                 }
 
-                newPlayer.mediaPlayer.playlist.addSources(sources);
+                newPlayer.mediaPlayer.playlist.addItems(sources);
 
                 listview.closeSelection()
             }

=== modified file 'app/components/Helpers/ContentHubHelper.qml'
--- app/components/Helpers/ContentHubHelper.qml	2015-11-02 15:58:44 +0000
+++ app/components/Helpers/ContentHubHelper.qml	2015-11-13 13:27:56 +0000
@@ -225,7 +225,7 @@
                 for (i=0; i < searchPaths.length; i++) {
                     model = musicStore.lookup(decodeFileURI(searchPaths[i]))
 
-                    newPlayer.mediaPlayer.playlist.addSource(Qt.resolvedUrl(decodeURIComponent(searchPaths[i])));
+                    newPlayer.mediaPlayer.playlist.addItem(Qt.resolvedUrl(decodeURIComponent(searchPaths[i])));
                 }
 
                 trackQueueClick(0);

=== modified file 'app/components/Helpers/UriHandlerHelper.qml'
--- app/components/Helpers/UriHandlerHelper.qml	2015-11-02 15:58:44 +0000
+++ app/components/Helpers/UriHandlerHelper.qml	2015-11-13 13:27:56 +0000
@@ -64,7 +64,7 @@
             }
 
             // enqueue
-            newPlayer.mediaPlayer.playlist.addSource(Qt.resolvedUrl(track.filename));
+            newPlayer.mediaPlayer.playlist.addItem(Qt.resolvedUrl(track.filename));
 
             // play first URI
             if (play) {

=== modified file 'app/components/ListItemActions/AddToQueue.qml'
--- app/components/ListItemActions/AddToQueue.qml	2015-11-02 15:58:44 +0000
+++ app/components/ListItemActions/AddToQueue.qml	2015-11-13 13:27:56 +0000
@@ -29,6 +29,6 @@
 
     onTriggered: {
         console.debug("Debug: Add track to queue: " + model)
-        newPlayer.mediaPlayer.playlist.addSource(Qt.resolvedUrl(model.filename))
+        newPlayer.mediaPlayer.playlist.addItem(Qt.resolvedUrl(model.filename))
     }
 }

=== modified file 'app/components/MusicToolbar.qml'
--- app/components/MusicToolbar.qml	2015-11-02 15:58:44 +0000
+++ app/components/MusicToolbar.qml	2015-11-13 13:27:56 +0000
@@ -170,7 +170,7 @@
                     fontSize: "small"
                     font.weight: Font.DemiBold
                     text: newPlayer.currentMeta.title === ""
-                          ? newPlayer.mediaPlayer.playlist.currentSource
+                          ? newPlayer.mediaPlayer.playlist.currentItemSource
                           : newPlayer.currentMeta.title
                 }
 

=== modified file 'app/components/NewPlayer.qml'
--- app/components/NewPlayer.qml	2015-11-02 17:10:45 +0000
+++ app/components/NewPlayer.qml	2015-11-13 13:27:56 +0000
@@ -26,7 +26,7 @@
 Item {
     objectName: "player"
 
-    property alias count: mediaPlayerPlaylist.mediaCount
+    property alias count: mediaPlayerPlaylist.itemCount
     property var currentMeta: ({})
     property alias mediaPlayer: mediaPlayer
     property alias repeat: settings.repeat
@@ -73,21 +73,22 @@
                 }
             }
 
-            readonly property int count: mediaCount  // header actions etc depend on the model having 'count'
+            readonly property int count: itemCount  // header actions etc depend on the model having 'count'
             property int pendingCurrentIndex: -1
             property var pendingCurrentState: null
             property int pendingShuffle: -1
 
-            onCurrentSourceChanged: currentMeta = metaForSource(currentSource)
-            onMediaChanged: {
+            onCurrentItemSourceChanged: currentMeta = metaForSource(currentItemSource)
+            onItemChanged: {
+                console.debug("*** Saving play queue in onItemChanged");
                 saveQueue()
 
-                // FIXME: shouldn't be needed? seems to be a bug where when appending currentSourceChanged is not emitted
+                // FIXME: shouldn't be needed? seems to be a bug where when appending currentItemChanged is not emitted
                 //if (start === currentIndex) {
                 //    currentMeta = metaForSource(currentSource)
                 //}
             }
-            onMediaInserted: {
+            onItemInserted: {
                 // When add to queue is done on an empty list currentIndex needs to be set
                 if (start === 0 && currentIndex === -1 && pendingCurrentIndex < 1 && pendingShuffle === -1) {
                     currentIndex = 0;
@@ -97,7 +98,7 @@
                 }
 
                 // Check if the pendingCurrentIndex is now valid
-                if (pendingCurrentIndex !== -1 && pendingCurrentIndex < mediaCount) {
+                if (pendingCurrentIndex !== -1 && pendingCurrentIndex < itemCount) {
                     currentIndex = pendingCurrentIndex;
 
                     pendingCurrentIndex = -1;
@@ -106,26 +107,28 @@
 
                 // Check if there is pending shuffle
                 // pendingShuffle holds the expected size of the model
-                if (pendingShuffle > -1 && pendingShuffle <= mediaCount) {
+                if (pendingShuffle > -1 && pendingShuffle <= itemCount) {
                     mediaPlayerPlaylist.shuffle();
 
                     pendingShuffle = -1;
                     mediaPlayer.next();  // play a random track
                 }
 
+                console.debug("*** Saving play queue in onItemInserted");
                 saveQueue()
 
-                // FIXME: shouldn't be needed? seems to be a bug where when appending currentSourceChanged is not emitted
+                // FIXME: shouldn't be needed? seems to be a bug where when appending currentItemChanged is not emitted
                 if (start === currentIndex) {
-                    currentMeta = metaForSource(currentSource)
+                    currentMeta = metaForSource(currentItemSource)
                 }
             }
-            onMediaRemoved: {
+            onItemRemoved: {
+                console.debug("*** Saving play queue in onItemRemoved");
                 saveQueue()
 
-                // FIXME: shouldn't be needed? seems to be a bug where when appending currentSourceChanged is not emitted
+                // FIXME: shouldn't be needed? seems to be a bug where when appending currentItemChanged is not emitted
                 if (start === currentIndex) {
-                    currentMeta = metaForSource(currentSource)
+                    currentMeta = metaForSource(currentItemSource)
                 }
             }
 
@@ -138,7 +141,7 @@
                     sources.push(Qt.resolvedUrl(model.get(i, model.RoleModelData).filename));
                 }
 
-                addSources(sources);
+                addItems(sources);
             }
 
             function processPendingCurrentState() {
@@ -158,11 +161,11 @@
                 pendingCurrentState = null;
             }
 
-            function removeSources(items) {
+            function removeItems(items) {
                 items.sort();
 
                 for (var i=0; i < items.length; i++) {
-                    removeSource(items[i] - i);
+                    removeItem(items[i] - i);
                 }
             }
 
@@ -178,8 +181,8 @@
 
                     var sources = [];
 
-                    for (var i=0; i < mediaPlayerPlaylist.mediaCount; i++) {
-                        sources.push(mediaPlayerPlaylist.source(i));
+                    for (var i=0; i < mediaPlayerPlaylist.itemCount; i++) {
+                        sources.push(mediaPlayerPlaylist.itemSource(i));
                     }
 
                     if (sources.length > 0) {
@@ -189,8 +192,8 @@
             }
 
             function setCurrentIndex(index) {
-                // Set the currentIndex but if the mediaCount is too low then wait
-                if (index < mediaPlayerPlaylist.mediaCount) {
+                // Set the currentIndex but if the itemCount is too low then wait
+                if (index < mediaPlayerPlaylist.itemCount) {
                     mediaPlayerPlaylist.currentIndex = index;
                 } else {
                     pendingCurrentIndex = index;
@@ -208,7 +211,7 @@
 
             function setPendingShuffle(modelSize) {
                 // Run shuffle() when the modelSize is reached
-                if (modelSize <= mediaCount) {
+                if (modelSize <= itemCount) {
                     mediaPlayerPlaylist.shuffle();
                     mediaPlayer.next();
                 } else {
@@ -225,7 +228,7 @@
             settings.shuffle
         }
         property bool canGoNext: {
-            playlist.currentIndex !== (playlist.mediaCount - 1) ||
+            playlist.currentIndex !== (playlist.itemCount - 1) ||
             settings.repeat ||
             settings.shuffle
         }

=== modified file 'app/components/Queue.qml'
--- app/components/Queue.qml	2015-11-03 19:36:24 +0000
+++ app/components/Queue.qml	2015-11-13 13:27:56 +0000
@@ -65,14 +65,14 @@
         leadingActions: ListItemActions {
             actions: [
                 Remove {
-                    onTriggered: newPlayer.mediaPlayer.playlist.removeSource(index)
+                    onTriggered: newPlayer.mediaPlayer.playlist.removeItem(index)
                 }
             ]
         }
         multiselectable: true
         objectName: "nowPlayingListItem" + index
         state: ""
-        reorderable: true  // FIXME: needs testing, sort out reordering we need moveSource(from, to);
+        reorderable: true  // FIXME: needs testing, sort out reordering we need moveItem(from, to);
         trailingActions: ListItemActions {
             actions: [
                 AddToPlaylist {
@@ -93,6 +93,6 @@
     onReorder: {
         console.debug("Move: ", from, to);
 
-        newPlayer.mediaPlayer.playlist.moveSource(from, to);
+        newPlayer.mediaPlayer.playlist.moveItem(from, to);
     }
 }

=== modified file 'app/music-app.qml'
--- app/music-app.qml	2015-11-02 15:58:44 +0000
+++ app/music-app.qml	2015-11-13 13:27:56 +0000
@@ -240,11 +240,15 @@
 
             // FIXME: using old queueList for now, move to load()/save() long term
             if (!Library.isQueueEmpty()) {
-                newPlayer.mediaPlayer.playlist.addSources(Library.getQueue());
+                console.debug("*** Restoring library queue");
+                newPlayer.mediaPlayer.playlist.addItems(Library.getQueue());
 
                 newPlayer.mediaPlayer.playlist.setCurrentIndex(queueIndex);
                 newPlayer.mediaPlayer.playlist.setPendingCurrentState(MediaPlayer.PausedState);  // TODO: confirm this works if index changes after
             }
+            else {
+                console.debug("Queue is empty, not loading any recent tracks");
+            }
         }
 
         // everything else
@@ -350,7 +354,7 @@
         if (!clear) {  // FIXME: is this even used anymore? trackQueueClick instead?
             // If same track and on Now playing page then toggle
             if ((mainPageStack.currentPage.title === i18n.tr("Now playing") || mainPageStack.currentPage.title === i18n.tr("Queue"))
-                    && Qt.resolvedUrl(newPlayer.mediaPlayer.playlist.currentSource) === file) {
+                    && Qt.resolvedUrl(newPlayer.mediaPlayer.playlist.currentItemSource) === file) {
                 newPlayer.mediaPlayer.toggle()
                 return;
             }
@@ -440,7 +444,7 @@
                 // If there are removed tracks then remove them from the queue and store
                 if (removed.length > 0) {
                     console.debug("Removed queue:", JSON.stringify(removed))
-                    newPlayer.mediaPlayer.playlist.removeSources(removed.slice());
+                    newPlayer.mediaPlayer.playlist.removeItems(removed.slice());
                 }
 
                 // Loop through playlists, getPlaylistTracks will remove any tracks that don't exist

=== modified file 'app/ui/NowPlaying.qml'
--- app/ui/NowPlaying.qml	2015-11-02 17:10:45 +0000
+++ app/ui/NowPlaying.qml	2015-11-13 13:27:56 +0000
@@ -131,7 +131,7 @@
                 // Use slice() to copy the list
                 // so that the indexes don't change as they are removed
                 // TODO: test!
-                newPlayer.mediaPlayer.playlist.removeSources(selectedIndices.slice());
+                newPlayer.mediaPlayer.playlist.removeItems(selectedIndices.slice());
             }
         }
     ]

=== modified file 'app/ui/Songs.qml'
--- app/ui/Songs.qml	2015-11-02 15:58:44 +0000
+++ app/ui/Songs.qml	2015-11-13 13:27:56 +0000
@@ -118,7 +118,7 @@
             onItemClicked: {
                 if (songsPage.state === "search") {  // only play single track when searching
                     newPlayer.mediaPlayer.playlist.clear();
-                    newPlayer.mediaPlayer.playlist.addSource(Qt.resolvedUrl(songsModelFilter.get(index).filename));
+                    newPlayer.mediaPlayer.playlist.addItem(Qt.resolvedUrl(songsModelFilter.get(index).filename));
                     trackQueueClick(0)
                 } else {
                     trackClicked(songsModelFilter, index)  // play track