Merge lp:~renatofilho/mediaplayer-app/fix-1230404 into lp:mediaplayer-app

[Bill Filler]

uri handler

uri handler

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:146
http://10.97.0.26:8080/job/mediaplayer-app-ci/131/
Executed test runs:
    UNSTABLE: http://10.97.0.26:8080/job/generic-mediumtests-saucy/4674
    UNSTABLE: http://10.97.0.26:8080/job/generic-mediumtests-touch/2478
    SUCCESS: http://10.97.0.26:8080/job/mediaplayer-app-saucy-amd64-ci/67
    SUCCESS: http://10.97.0.26:8080/job/mediaplayer-app-saucy-armhf-ci/67
        deb: http://10.97.0.26:8080/job/mediaplayer-app-saucy-armhf-ci/67/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/mediaplayer-app-saucy-i386-ci/67
    UNSTABLE: http://10.97.0.26:8080/job/autopilot-testrunner-otto-saucy/862
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-amd64/549
        deb: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-amd64/549/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2480
        deb: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2480/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://10.97.0.26:8080/job/generic-mediumtests-runner-maguro/2038
    UNSTABLE: http://10.97.0.26:8080/job/generic-mediumtests-runner-mako/2051

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mediaplayer-app-ci/131/rebuild

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://10.97.0.26:8080/job/mediaplayer-app-autolanding/63/
Executed test runs:
    UNSTABLE: http://10.97.0.26:8080/job/generic-mediumtests-touch/2534
    SUCCESS: http://10.97.0.26:8080/job/mediaplayer-app-saucy-amd64-autolanding/39
    SUCCESS: http://10.97.0.26:8080/job/mediaplayer-app-saucy-armhf-autolanding/39
        deb: http://10.97.0.26:8080/job/mediaplayer-app-saucy-armhf-autolanding/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/mediaplayer-app-saucy-i386-autolanding/39
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2536
        deb: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2536/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://10.97.0.26:8080/job/generic-mediumtests-runner-maguro/2087
    UNSTABLE: http://10.97.0.26:8080/job/generic-mediumtests-runner-mako/2100

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

Manually merged via jenkins. The failures are due to a known issue and unrelated to the MP.

=== modified file 'src/qml/player.qml'
--- src/qml/player.qml	2013-09-03 15:24:02 +0000
+++ src/qml/player.qml	2013-10-06 21:40:27 +0000
@@ -23,6 +23,7 @@
 import QtQuick.Window 2.0
 import QtMultimedia 5.0
 import Ubuntu.Unity.Action 1.0 as UnityActions
+import Ubuntu.Components 0.1
 
 Rectangle {
     id: mediaPlayer
@@ -58,7 +59,7 @@
         anchors.fill: parent
         clip: true
         onLoaded: {
-            item.focus = true            
+            item.focus = true
             item.rotating = Qt.binding(function () { return rotatingTransition.running } )
             item.playUri(playUri)
         }
@@ -191,4 +192,13 @@
             rotateCounterClockwise()
         }
     }
+
+    Connections {
+        target: UriHandler
+        onOpened: {
+            for (var i = 0; i < uris.length; ++i) {
+                playerLoader.item.playUri(uris[i])
+            }
+        }
+    }
 }