Merge lp:~jhodapp/mediaplayer-app/mediaplayer_new-orientation into lp:mediaplayer-app

[Jim Hodapp]

* Greatly simplified UI orientation/rotation support based on Screen.orientation instead of directly using QtSensors.
* Removed the sensor related package dependencies since they're no longer required due to this functionality being moved into qtubuntu.
* Got rid of an unecessary debug statement and added useful comment to new orientation implementation.

* Greatly simplified UI orientation/rotation support based on Screen.orientation instead of directly using QtSensors.
* Removed the sensor related package dependencies since they're no longer required due to this functionality being moved into qtubuntu.
* Got rid of an unecessary debug statement and added useful comment to new orientation implementation.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:58
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/92/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/92/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/92//rebuild/?

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

works nice, great job

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-02-27 14:39:24 +0000
+++ debian/control	2013-02-27 14:39:24 +0000
@@ -24,13 +24,10 @@
          mediaplayerplugin-aal[armel],
          mediaplayerplugin-aal[armhf],
          libqt5declarative5-qtmultimedia-plugin,
-         libqt5sensors5,
          qtdeclarative5-window-plugin,
          qtdeclarative5-xmllistmodel-plugin,
          qt-components-ubuntu,
          libhud-qt-qml,
-         qtubuntu-sensors[armel],
-         qtubuntu-sensors[armhf],
          gstreamer0.10-ffmpeg,
          gstreamer0.10-plugins-base,
          gstreamer0.10-plugins-good,

=== modified file 'src/mediaplayer.cpp'
--- src/mediaplayer.cpp	2013-02-12 21:35:22 +0000
+++ src/mediaplayer.cpp	2013-02-27 14:39:24 +0000
@@ -30,6 +30,7 @@
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusReply>
 #include <QtDBus/QDBusConnectionInterface>
+#include <QScreen>
 #include "config.h"
 
 static void printUsage(const QStringList& arguments)
@@ -94,6 +95,12 @@
     connect(m_view, SIGNAL(heightChanged(int)), SLOT(onHeightChanged(int)));
     connect(m_view->engine(), SIGNAL(quit()), SLOT(quit()));
 
+    // Set the orientation changes that this app is interested in being signaled about
+    QGuiApplication::primaryScreen()->setOrientationUpdateMask(Qt::PortraitOrientation |
+            Qt::LandscapeOrientation |
+            Qt::InvertedPortraitOrientation |
+            Qt::InvertedLandscapeOrientation);
+
     QUrl source(mediaPlayerDirectory() + "/qml/player.qml");
     m_view->setSource(source);
     m_view->setWidth(1200);

=== modified file 'src/qml/player.qml'
--- src/qml/player.qml	2013-02-20 23:47:09 +0000
+++ src/qml/player.qml	2013-02-27 14:39:24 +0000
@@ -22,7 +22,6 @@
 import QtQuick 2.0
 import QtQuick.Window 2.0
 import QtMultimedia 5.0
-import QtSensors 5.0
 import Ubuntu.HUD 0.1 as HUD
 
 Rectangle {
@@ -43,6 +42,11 @@
         }
     }
 
+    Screen.onOrientationChanged: {
+        // Rotate the UI when the device orientation changes
+        mediaPlayer.orientation = Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
+    }
+
     Loader {
         id: playerLoader
         source: "player/VideoPlayer.qml"
@@ -127,73 +131,6 @@
             }
           }
         ]
-
-        OrientationSensor {
-            id: orientationSensor
-            active: true
-
-            // Causes the media player UI to rotate when the target device is rotated
-            onReadingChanged: {
-                setOrientation("sensor", reading.orientation)
-            }
-        }
-    }
-
-    onNativeOrientationChanged:  {
-        // Discover the device based on native orientation
-        // This is necessary because the Screen.currentOrientation does not notify
-        // about orientation changes and we need translate the sensors information
-        // TODO: remove it when "Screen.currentOrientation" get fixed
-        if (nativeOrientation == Qt.LandscapeOrientation)
-            formFactor = "tablet"
-        else
-            formFactor = "phone"
-
-        setOrientation("qpa", nativeOrientation)
-    }
-
-    function setOrientation(type, orient) {
-        var newOrientation = null
-        if (type === "sensor") {
-            // translate sensors information based on formFactor
-            switch (orient)
-            {
-            case OrientationReading.LeftUp:
-                if (formFactor == "tablet") {
-                    newOrientation = Qt.InvertedPortraitOrientation
-                } else {
-                    newOrientation = Qt.LandscapeOrientation
-                }
-                break;
-            case OrientationReading.RightUp:
-                if (formFactor == "tablet") {
-                    newOrientation = Qt.PortraitOrientation
-                } else {
-                    newOrientation = Qt.InvertedLandscapeOrientation
-                }
-                break;
-            case OrientationReading.TopUp:
-                if (formFactor == "tablet") {
-                    newOrientation = Qt.LandscapeOrientation
-                } else {
-                    newOrientation = Qt.PortraitOrientation
-                }
-                break;
-            case OrientationReading.TopDown:
-                if (formFactor == "tablet") {
-                    newOrientation = Qt.InvertedLandscapeOrientation
-                } else {
-                    newOrientation = Qt.InvertedPortraitOrientation
-                }
-                break;
-            }
-        } else {
-            newOrientation = orient
-        }
-
-        if (newOrientation) {
-            mediaPlayer.orientation = Screen.angleBetween(Screen.primaryOrientation, newOrientation)
-        }
     }
 
     HUD.HUD {