Merge lp:~renatofilho/gallery-app/use-mediaplayer-components into lp:gallery-app

[Renato Araujo Oliveira Filho]

Make use of MediaPlayer components.

YOU WILL NEED THIS: https://code.launchpad.net/~renatofilho/ubuntu-ui-extras/new-mediaplayer-components/+merge/241794

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1112
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1077/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/5
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/18
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/163
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/661
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/35
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15906
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/167
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/167/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1077/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1112
https://jenkins.canonical.com/system-apps/job/lp-gallery-app-ci/5/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/696/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/696/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-gallery-app-ci/5/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1112. By Renato Araujo Oliveira Filho on 2014-11-17

Make use of MediaPlayer components.

=== modified file 'rc/qml/MediaViewer/SingleMediaViewer.qml'
--- rc/qml/MediaViewer/SingleMediaViewer.qml	2014-10-09 16:08:50 +0000
+++ rc/qml/MediaViewer/SingleMediaViewer.qml	2014-11-17 17:28:10 +0000
@@ -15,12 +15,12 @@
  */
 
 import QtQuick 2.2
-import QtMultimedia 5.0
 import Ubuntu.Components 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItems
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Content 0.1
 import Ubuntu.Thumbnailer 0.1
+import Ubuntu.Components.Extras.MediaPlayer 0.1 as MediaPlayer
 import Gallery 1.0
 import "../Components"
 
@@ -184,11 +184,10 @@
                 visible: viewer.isVideo && video.status == Loader.Ready &&
                          video.item.playbackState !== MediaPlayer.StoppedState
                 onLoaded: {
-                    item.source = mediaSource.path;
-                    item.play()
+                    item.playUri(mediaSource.path)
                 }
 
-                property bool isPlaying: item && item.playbackState === MediaPlayer.PlayingState
+                property bool isPlaying: item && item.playing
                 function play() {
                     if (item) {
                         item.play();
@@ -215,6 +214,7 @@
 
             MouseArea {
                 anchors.fill: parent
+                enabled: !video.visible
                 onDoubleClicked: {
                     clickTimer.stop();
                     if (viewer.isVideo) return;
@@ -233,19 +233,24 @@
                     onTriggered: viewer.clicked()
                 }
             }
-
-            MouseArea {
-                anchors.centerIn: parent
-                width: units.gu(10)
-                height: units.gu(10)
-                enabled: viewer.isVideo
-                onClicked: viewer.togglePlayPause()
-            }
         }
 
         Component {
             id: component_video
-            Video { }
+            MediaPlayer.VideoPlayer {
+                settingsEnabled: false
+                onStatusChanged: {
+                    if (status === MediaPlayer.EndOfMedia) {
+                        stop()
+                        controlsActive = true
+                    }
+                }
+                onFullscreenModeChanged: {
+                    if (!fullscreenMode) {
+                        //FIXME: go back to list page
+                    }
+                }
+            }
         }
     }
 }