Merge lp:~phablet-team/mediaplayer-app/remove_powerd into lp:mediaplayer-app

Proposed by Jim Hodapp
Status: Merged
Merge reported by: Renato Araujo Oliveira Filho
Merged at revision: not available
Proposed branch: lp:~phablet-team/mediaplayer-app/remove_powerd
Merge into: lp:mediaplayer-app
Diff against target: 57 lines (+3/-5)
3 files modified
po/mediaplayer-app.pot (+1/-1)
src/qml/player/AbstractPlayer.qml (+0/-2)
tests/autopilot/mediaplayer_app/tests/test_player_with_video.py (+2/-2)
To merge this branch: bzr merge lp:~phablet-team/mediaplayer-app/remove_powerd
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ricardo Salveti (community) Approve
Ubuntu Phablet Team code Pending
Review via email: mp+214993@code.launchpad.net

Commit message

* Remove the powerd lock since it's moving into media-hub

Description of the change

* Remove the powerd lock since it's moving into media-hub

To post a comment you must log in.
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Good, thanks.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
214. By Jim Hodapp

Use a video that actually works with hardware video decoding and media-hub

215. By Jim Hodapp

Merged with powerd removal changes

216. By Jim Hodapp

Remove merge conflict with upstream

217. By Jim Hodapp

Restore the qtpowerd package requirement to resolve merge conflict

218. By Jim Hodapp

Correct dependencies for qtdeclarative dependency

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) :
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

replaces with a new one: ~renatofilho/mediaplayer-app/remove_powerd

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

in fact it was merged already :D

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/mediaplayer-app.pot'
2--- po/mediaplayer-app.pot 2014-03-27 22:46:07 +0000
3+++ po/mediaplayer-app.pot 2014-04-28 18:32:01 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2014-03-27 18:44-0400\n"
9+"POT-Creation-Date: 2014-04-09 16:49+0000\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13
14=== modified file 'src/qml/player/AbstractPlayer.qml'
15--- src/qml/player/AbstractPlayer.qml 2013-10-14 21:29:28 +0000
16+++ src/qml/player/AbstractPlayer.qml 2014-04-28 18:32:01 +0000
17@@ -20,7 +20,6 @@
18 */
19 import QtQuick 2.0
20 import QtMultimedia 5.0
21-import QtPowerd 0.1
22 import "../common"
23 import "../common/utils.js" as Utils
24
25@@ -28,7 +27,6 @@
26 id: player
27
28 property bool playing: state == "playing"
29- onPlayingChanged: QtPowerd.keepDisplayOn = playing
30 property bool paused: state == "paused"
31 property real aspectRatio: width / height
32 property variant video: mediaPlayer
33
34=== modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py'
35--- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2014-01-07 19:45:40 +0000
36+++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2014-04-28 18:32:01 +0000
37@@ -26,7 +26,7 @@
38 In the testfarm, the application may take some time to show up."""
39 def setUp(self):
40 super(TestPlayerWithVideo, self).setUp()
41- self.launch_app("small.ogg")
42+ self.launch_app("h264.avi")
43 self.assertThat(
44 self.main_window.get_qml_view().visible, Eventually(Equals(True)))
45 # wait video player start
46@@ -143,7 +143,7 @@
47 @skipIf(model() == 'Nexus 4' or model() == 'Galaxy Nexus', 'Screen width not enough for seekbar')
48 def test_show_controls_at_end(self):
49 controls = self.main_window.get_controls()
50- """ The controls are invisible by defautl """
51+ """ The controls are invisible by default """
52 self.assertThat(controls.visible, Eventually(Equals(False)))
53
54 """ wait for video ends and control appears """
55
56=== added file 'tests/videos/h264.avi'
57Binary files tests/videos/h264.avi 1970-01-01 00:00:00 +0000 and tests/videos/h264.avi 2014-04-28 18:32:01 +0000 differ

Subscribers

People subscribed via source and target branches