Merge lp:~ahayzen/music-app/remix-console-errors-queue-clear into lp:music-app/remix

[Andrew Hayzen]

* Fix for console errors when clearing the queue

* Fix for console errors when clearing the queue

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

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

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-console-errors-queue-clear]

706. By Andrew Hayzen on 2014-10-28

* Fix for settings source directly

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

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

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

LGTM, I couldn't find any other such instances.

review: Approve

=== modified file 'Player.qml'
--- Player.qml	2014-10-27 13:19:40 +0000
+++ Player.qml	2014-10-28 01:43:52 +0000
@@ -62,10 +62,10 @@
         onCountChanged: {
             if (trackQueue.model.count === 1) {
                 player.currentIndex = 0;
-                mediaPlayerLoader.item.source = Qt.resolvedUrl(trackQueue.model.get(0).filename)
+                setSource(Qt.resolvedUrl(trackQueue.model.get(0).filename))
             } else if (trackQueue.model.count === 0) {
-                player.currentMetaFile = ""
-                mediaPlayerLoader.item.source = ""
+                player.currentIndex = -1
+                setSource("")
             }
         }
     }
@@ -123,7 +123,7 @@
         }
         else {
             currentIndex = newIndex
-            source = Qt.resolvedUrl(trackQueue.model.get(newIndex).filename)
+            setSource(Qt.resolvedUrl(trackQueue.model.get(newIndex).filename))
         }
 
         // Set index into queue
@@ -196,7 +196,7 @@
                         return
                     }
 
-                    if (source === "") {
+                    if (source.toString() === "") {
                         player.currentIndex = -1
                         player.stop()
                     }