Merge lp:~renatofilho/mediaplayer-app/scene-selector-desktop into lp:mediaplayer-app

[Renato Araujo Oliveira Filho]

Enabled scene selector in desktop mode.

[Dimitri John Ledkov (xnox)]

libgstreamer0.10-dev is deprecated and should not be used. please use gstreamer-1.0 only.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:194
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/172/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2237
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2122/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-i386-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1955
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2239
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2239/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2122
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2122/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4582/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2980

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

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

> libgstreamer0.10-dev is deprecated and should not be used. please use
> gstreamer-1.0 only.

The current version of qtmutimedia uses libgstreamer0.10-dev there is no way to load 2 versions of gst in the same app. Because of that we still need to use the version 0.10 until a new version of qtmutimedia get released.

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

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

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

194. By Renato Araujo Oliveira Filho on 2014-01-10

Enabled scene selector in desktop mode.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-25 23:08:08 +0000
+++ CMakeLists.txt	2014-01-10 13:46:35 +0000
@@ -30,7 +30,7 @@
 find_package(Qt5Quick)
 
 include(FindPkgConfig)
-#pkg_check_modules(GSTLIB REQUIRED gstreamer-1.0)
+pkg_check_modules(GSTLIB REQUIRED gstreamer-0.10)
 
 # Standard install paths
 include(GNUInstallDirs)

=== modified file 'debian/control'
--- debian/control	2013-10-14 21:48:26 +0000
+++ debian/control	2014-01-10 13:46:35 +0000
@@ -8,6 +8,7 @@
                libgl1-mesa-dev[i386 amd64] | libgl-dev[i386 amd64],
                libgles2-mesa-dev[armhf],
                pkg-config,
+               libgstreamer0.10-dev,
                python,
                qtbase5-dev,
                qtdeclarative5-dev,

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-01-07 19:36:45 +0000
+++ src/CMakeLists.txt	2014-01-10 13:46:35 +0000
@@ -5,17 +5,17 @@
 include_directories(
     ${CMAKE_BINARY_DIR}
     ${sdkhelper_SOURCE_DIR}
-    #${GSTLIB_INCLUDE_DIRS}
+    ${GSTLIB_INCLUDE_DIRS}
     )
 
 set(mediaplayer_HDRS
-    #thumbnail-provider.h
-    #thumbnail-pipeline-gst.h
+    thumbnail-provider.h
+    thumbnail-pipeline-gst.h
     mediaplayer.h)
 
 set(mediaplayer_SRCS
-    #thumbnail-provider.cpp
-    #thumbnail-pipeline-gst.cpp
+    thumbnail-provider.cpp
+    thumbnail-pipeline-gst.cpp
     mediaplayer.cpp
     main.cpp)
 
@@ -28,7 +28,7 @@
 
 target_link_libraries(${MEDIAPLAYER}
     sdkhelper
-    #${GSTLIB_LDFLAGS}
+    ${GSTLIB_LDFLAGS}
     )
 
 install(TARGETS ${MEDIAPLAYER}

=== modified file 'src/mediaplayer.cpp'
--- src/mediaplayer.cpp	2014-01-08 22:38:38 +0000
+++ src/mediaplayer.cpp	2014-01-10 13:46:35 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "mediaplayer.h"
-//#include "thumbnail-provider.h"
+#include "thumbnail-provider.h"
 #include "sharefile.h"
 
 #include <QtCore/QDir>
@@ -82,7 +82,9 @@
     qmlRegisterType<ShareFile>("SDKHelper", 1, 0, "ShareFile");
 
     m_view = new QQuickView();
-    //m_view->engine()->addImageProvider("video", new ThumbnailProvider);
+    if (isDesktopMode()) {
+        m_view->engine()->addImageProvider("video", new ThumbnailProvider);
+    }
     m_view->setColor(QColor("black"));
     m_view->setResizeMode(QQuickView::SizeRootObjectToView);
     m_view->setTitle("Media Player");

=== modified file 'src/qml/player/Controls.qml'
--- src/qml/player/Controls.qml	2014-01-07 19:36:45 +0000
+++ src/qml/player/Controls.qml	2014-01-10 13:46:35 +0000
@@ -66,16 +66,10 @@
 
         property bool parentActive: _controls.active
 
-        function selectSceneAt(time) {
-            // SKIP it for now, we need to fix hybris bug #1231147
-            return
-        }
-
         objectName: "Controls.SceneSelector"
         opacity: 0
         visible: opacity > 0
-        // SKIP it for now, we need to fix hybris bug #1231147
-        //model: _sceneSelectorModel
+        model: mpApplication.desktopMode ? _sceneSelectorModel : []
         anchors {
             left: parent.left
             right: parent.right
@@ -93,7 +87,7 @@
             id: _showAnimation
 
             // SKIP it for now, we need to fix hybris bug #1231147
-            running: false //_sceneSelector.show
+            running: mpApplication.desktopMode ? _sceneSelector.show : false
             NumberAnimation { target: _sceneSelector; property: "opacity"; to: 1; duration: 175 }
             NumberAnimation { target: controls; property: "heightOffset"; to: 0; duration: 175 }
         }
@@ -102,7 +96,7 @@
             id: _hideAnimation
 
             // SKIP it for now, we need to fix hybris bug #1231147
-            running: false //!_sceneSelector.show
+            running: mpApplication.desktopMode ? !_sceneSelector.show : false
             NumberAnimation { target: _sceneSelector; property: "opacity"; to: 0; duration: 175 }
             NumberAnimation { target: controls; property: "heightOffset"; to: units.gu(2); duration: 175 }
         }
@@ -208,12 +202,18 @@
                                 seeking = true
                             }
                             seekRequested(liveValue * 1000)
-                            _sceneSelector.selectSceneAt(liveValue * 1000)
+                            if (mpApplication.desktopMode) {
+                                _sceneSelector.selectSceneAt(liveValue * 1000)
+                            }
                         }
                     }
                 }
 
-                onValueChanged: _sceneSelector.selectSceneAt(video.position)
+                onValueChanged: {
+                    if (mpApplication.desktopMode) {
+                        _sceneSelector.selectSceneAt(video.position)
+                    }
+                }
 
                 onClicked: {
                     if (insideThumb) {