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

Proposed by Loïc Minier
Status: Rejected
Rejected by: Renato Araujo Oliveira Filho
Proposed branch: lp:~lool/mediaplayer-app/qtpowerd-keep-screen-on
Merge into: lp:mediaplayer-app
Diff against target: 31 lines (+3/-0)
2 files modified
debian/control (+1/-0)
src/qml/player/AbstractPlayer.qml (+2/-0)
To merge this branch: bzr merge lp:~lool/mediaplayer-app/qtpowerd-keep-screen-on
Reviewer Review Type Date Requested Status
Renato Araujo Oliveira Filho (community) Disapprove
PS Jenkins bot continuous-integration Needs Fixing
Didier Roche-Tolomelli Approve
Review via email: mp+191061@code.launchpad.net

Commit message

Use QtPowerd to keep display on when playing.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

working fine on mako with latest powerd

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

this code was moved to media-hub

review: Disapprove

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
23Architecture: i386 amd64 armhf23Architecture: i386 amd64 armhf
24Depends: ${misc:Depends},24Depends: ${misc:Depends},
25 ${shlibs:Depends},25 ${shlibs:Depends},
26 qtdeclarative5-qtpowerd0.1,
26 qtdeclarative5-qtmultimedia-plugin | libqt5declarative5-qtmultimedia-plugin,27 qtdeclarative5-qtmultimedia-plugin | libqt5declarative5-qtmultimedia-plugin,
27 qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,28 qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
28 qtdeclarative5-ubuntu-ui-extras0.1,29 qtdeclarative5-ubuntu-ui-extras0.1,
2930
=== 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 @@
20 */20 */
21import QtQuick 2.021import QtQuick 2.0
22import QtMultimedia 5.022import QtMultimedia 5.0
23import QtPowerd 0.1
23import "../common"24import "../common"
24import "../common/utils.js" as Utils25import "../common/utils.js" as Utils
2526
@@ -27,6 +28,7 @@
27 id: player28 id: player
2829
29 property bool playing: state == "playing"30 property bool playing: state == "playing"
31 onPlayingChanged: QtPowerd.keepDisplayOn = playing
30 property bool paused: state == "paused"32 property bool paused: state == "paused"
31 property real aspectRatio: width / height33 property real aspectRatio: width / height
32 property variant video: mediaPlayer34 property variant video: mediaPlayer

Subscribers

People subscribed via source and target branches