Merge lp:~artmello/gallery-app/gallery-app-call_media_player_for_videos into lp:gallery-app

[Arthur Mello]

Makes gallery-app to call MediaPlayer to play videos instead of playing by itself

Makes gallery-app to call MediaPlayer to play videos instead of playing by itself

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1137
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1106/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/34
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/113
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/499/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/752
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/214
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17588
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/402/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/607
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/607/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Ugo Riboni (uriboni)]

Code looks good and works as expected.

review: Approve

[lp:~artmello/gallery-app/gallery-app-call_media_player_for_videos]

1138. By Arthur Mello on 2015-01-30

Use the same toolbar for any media type
Do not enable the editor menu for videos

=== modified file 'rc/qml/MediaViewer/MediaViewer.qml'
--- rc/qml/MediaViewer/MediaViewer.qml	2015-01-20 17:38:45 +0000
+++ rc/qml/MediaViewer/MediaViewer.qml	2015-01-30 17:40:10 +0000
@@ -63,9 +63,7 @@
     property bool isReady: model != null && model.count > 0 && galleryPhotoViewer.currentItem
 
     // tooolbar actions for the full view
-    property variant actions: (media && !sharePicker.visible) ? (media.type === MediaSource.Photo ?
-                                      d.photoActions : d.videoActions)
-                               : []
+    property variant actions: (media && !sharePicker.visible) ? d.mediaActions : []
 
     property variant backAction: d.backAction
 
@@ -100,20 +98,6 @@
         galleryPhotoViewer.goForward();
     }
 
-    // If the media item is a video, start playing it
-    function playVideo()
-    {
-        if (!galleryPhotoViewer.currentItem)
-            return;
-        if (galleryPhotoViewer.media.type !== MediaSource.Video)
-            return;
-
-        if (galleryPhotoViewer.currentItem.isPlayingVideo)
-            return;
-
-        galleryPhotoViewer.currentItem.togglePlayPause();
-    }
-
     function setHeaderVisibility(visible)
     {
         header.visible = visible;    
@@ -469,12 +453,12 @@
     Item {
         id: d
 
-        property list<Action> photoActions: [
+        property list<Action> mediaActions: [
             Action {
                 objectName: "editButton"
                 text: i18n.tr("Edit")
                 iconSource: "../../img/edit.png"
-                enabled: galleryPhotoViewer.media.canBeEdited
+                enabled: galleryPhotoViewer.media.type === MediaSource.Photo && galleryPhotoViewer.media.canBeEdited
                 onTriggered: PopupUtils.open(editPopoverComponent, null);
             },
             Action {
@@ -507,46 +491,6 @@
             }
         ]
  
-
-        property list<Action> videoActions: [
-            Action {
-                text: galleryPhotoViewer.currentItem ?
-                    (galleryPhotoViewer.currentItem.isPlayingVideo ?
-                        i18n.tr("Pause") : i18n.tr("Play"))
-                    : ""
-                iconSource: galleryPhotoViewer.currentItem ?
-                    (galleryPhotoViewer.currentItem.isPlayingVideo ?
-                        "../../img/icon_pause.png" : "../../img/icon_play.png")
-                    : ""
-                onTriggered: galleryPhotoViewer.currentItem.togglePlayPause();
-            },
-            Action {
-                text: i18n.tr("Add to album")
-                iconName: "add"
-                onTriggered: {
-                    __albumPicker = PopupUtils.open(Qt.resolvedUrl("../Components/PopupAlbumPicker.qml"),
-                                                    null,
-                                                    {contentHeight: viewerWrapper.__pickerContentHeight});
-                }
-            },
-            Action {
-                text: i18n.tr("Delete")
-                iconName: "delete"
-                onTriggered: {
-                    if (album)
-                        PopupUtils.open(removeFromAlbumDialog, null);
-                    else
-                        PopupUtils.open(deleteDialog, null);
-                }
-            },
-            Action {
-                text: i18n.tr("Share")
-                iconName: "share"
-                visible: !APP.desktopMode
-                onTriggered: sharePicker.visible = true;
-            }
-        ]
-
         property Action backAction: Action {
             iconName: "back"
             onTriggered: {

=== modified file 'rc/qml/MediaViewer/PopupPhotoViewer.qml'
--- rc/qml/MediaViewer/PopupPhotoViewer.qml	2014-11-06 14:43:21 +0000
+++ rc/qml/MediaViewer/PopupPhotoViewer.qml	2015-01-30 17:40:10 +0000
@@ -140,7 +140,6 @@
             overview.pushPage(popupPhotoViewer);
             header.visible = false;
             opened();
-            viewer.playVideo();
         }
 
         onTransitionFromPhotoViewerCompleted: {
@@ -152,10 +151,7 @@
         id: fadeIn
 
         target: viewer
-        onStopped: {
-            opened();
-            viewer.playVideo();
-        }
+        onStopped: opened()
     }
 
     FadeOutAnimation {

=== modified file 'rc/qml/MediaViewer/SingleMediaViewer.qml'
--- rc/qml/MediaViewer/SingleMediaViewer.qml	2015-01-20 17:38:45 +0000
+++ rc/qml/MediaViewer/SingleMediaViewer.qml	2015-01-30 17:40:10 +0000
@@ -32,7 +32,6 @@
     property bool showThumbnail: true
 
     property bool isVideo: mediaSource.type === MediaSource.Video
-    property bool isPlayingVideo: isVideo && video.isPlaying
     property bool userInteracting: pinchInProgress || flickable.sizeScale != 1.0
     property bool fullyZoomed: flickable.sizeScale == zoomPinchArea.maximumZoom
     property bool fullyUnzoomed: flickable.sizeScale == zoomPinchArea.minimumZoom
@@ -57,17 +56,8 @@
     }
 
     function reset() {
-        if (viewer.isVideo) {
-            if (video.item) {
-                video.item.stop();
-                video.sourceComponent = null;
-            }
-        } else zoomOut()
-    }
-
-    function togglePlayPause() {
-        if (video.isPlaying) video.pause();
-        else video.play();
+        if (!viewer.isVideo)
+            zoomOut()
     }
 
     ActivityIndicator {
@@ -141,7 +131,7 @@
                         height: viewer.maxDimension
                     }
                     fillMode: Image.PreserveAspectFit
-                    visible: viewer.showThumbnail && video.status !== Loader.Ready
+                    visible: viewer.showThumbnail
                     opacity: status == Image.Ready ? 1.0 : 0.0
                     Behavior on opacity { UbuntuNumberAnimation {duration: UbuntuAnimation.FastDuration} }
 
@@ -162,30 +152,6 @@
                 }
             }
 
-            Loader {
-                id: video
-                anchors.fill: parent
-                visible: viewer.isVideo && video.status == Loader.Ready &&
-                         video.item.playbackState !== MediaPlayer.StoppedState
-                onLoaded: {
-                    item.source = mediaSource.path;
-                    item.play()
-                }
-
-                property bool isPlaying: item && item.playbackState === MediaPlayer.PlayingState
-                function play() {
-                    if (item) {
-                        item.play();
-                    } else {
-                        viewer.showThumbnail = false;
-                        sourceComponent = component_video;
-                    }
-                }
-                function pause() {
-                    if (item) item.pause();
-                }
-            }
-
             Icon {
                 width: units.gu(5)
                 height: units.gu(5)
@@ -193,8 +159,7 @@
                 name: "media-playback-start"
                 color: "white"
                 opacity: 0.8
-                visible: viewer.isVideo &&
-                         (!video.item || item.playbackState === MediaPlayer.StoppedState)
+                visible: viewer.isVideo
             }
 
             MouseArea {
@@ -223,14 +188,13 @@
                 width: units.gu(10)
                 height: units.gu(10)
                 enabled: viewer.isVideo
-                onClicked: viewer.togglePlayPause()
+                onClicked: {
+                    if (viewer.isVideo) {
+                        var url = mediaSource.path.toString().replace("file://", "video://");
+                        Qt.openUrlExternally(url);
+                    }
+                }
             }
         }
-
-        Component {
-            id: component_video
-            Video { }
-        }
     }
 }
-