Merge lp:~lool/mediaplayer-app/qtpowerd-keep-screen-on into lp:mediaplayer-app

[Loïc Minier]

Use QtPowerd to keep display on when playing.

Use QtPowerd to keep display on when playing.

Tested with binaries provided by Ricardo Mendoza with https://code.launchpad.net/~ricmm/qtpowerd/use-pid-for-name/+merge/191052 merged.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/136/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2926
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2928
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2928/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2436
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2479

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:161
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/137/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2927
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/73
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/73/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2929
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2929/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2437
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2480

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

review: Needs Fixing (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

working fine on mako with latest powerd

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-autolanding/67/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2933
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-autolanding/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-autolanding/43
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-autolanding/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-autolanding/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2935
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2935/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2443
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2486

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:161
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/139/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2967
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/75
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/75/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2969
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2969/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2475
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2519

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

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

this code was moved to media-hub

review: Disapprove

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2013-09-25 23:08:08 +0000
+++ debian/control	2013-10-14 21:48:36 +0000
@@ -23,6 +23,7 @@
 Architecture: i386 amd64 armhf
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         qtdeclarative5-qtpowerd0.1,
          qtdeclarative5-qtmultimedia-plugin | libqt5declarative5-qtmultimedia-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-ubuntu-ui-extras0.1,

=== modified file 'src/qml/player/AbstractPlayer.qml'
--- src/qml/player/AbstractPlayer.qml	2013-04-18 21:52:51 +0000
+++ src/qml/player/AbstractPlayer.qml	2013-10-14 21:48:36 +0000
@@ -20,6 +20,7 @@
  */
 import QtQuick 2.0
 import QtMultimedia 5.0
+import QtPowerd 0.1
 import "../common"
 import "../common/utils.js" as Utils
 
@@ -27,6 +28,7 @@
     id: player
 
     property bool playing: state == "playing"
+    onPlayingChanged: QtPowerd.keepDisplayOn = playing
     property bool paused: state == "paused"
     property real aspectRatio: width / height
     property variant video: mediaPlayer