Merge lp:~ricmm/mediaplayer-app/no-clip into lp:mediaplayer-app

Proposed by Ricardo Mendoza
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 349
Merged at revision: 349
Proposed branch: lp:~ricmm/mediaplayer-app/no-clip
Merge into: lp:mediaplayer-app
Diff against target: 42 lines (+2/-5)
2 files modified
src/qml/player.qml (+1/-3)
src/qml/player/AbstractPlayer.qml (+1/-2)
To merge this branch: bzr merge lp:~ricmm/mediaplayer-app/no-clip
Reviewer Review Type Date Requested Status
Ricardo Salveti (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+257687@code.launchpad.net

Commit message

Bug #1417006
Performance/Rendering fixes:
 * Remove clipping on video loader
 * Remove unused rectangles (overdraw)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:349
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/263/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2505
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/829/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-i386-ci/21
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2503
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2503/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19994
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/662/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/991
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/991/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Looks good and works as expected.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/player.qml'
2--- src/qml/player.qml 2014-10-15 21:26:33 +0000
3+++ src/qml/player.qml 2015-04-28 18:57:02 +0000
4@@ -26,8 +26,7 @@
5 import Ubuntu.Components 1.1
6 import Ubuntu.Components.Popups 1.0 as Popups
7
8-
9-Rectangle {
10+Item {
11 id: mediaPlayer
12 width: screenWidth
13 height: screenHeight
14@@ -81,7 +80,6 @@
15 source: "player/VideoPlayer.qml"
16 focus: true
17 anchors.fill: parent
18- clip: true
19 onLoaded: {
20 item.focus = true
21 item.rotating = Qt.binding(function () { return rotatingTransition.running } )
22
23=== modified file 'src/qml/player/AbstractPlayer.qml'
24--- src/qml/player/AbstractPlayer.qml 2015-03-20 17:34:56 +0000
25+++ src/qml/player/AbstractPlayer.qml 2015-04-28 18:57:02 +0000
26@@ -23,7 +23,7 @@
27 import "../common"
28 import "../common/utils.js" as Utils
29
30-Rectangle {
31+Item {
32 id: player
33
34 property bool playing: state == "playing"
35@@ -44,7 +44,6 @@
36
37 objectName: "videoPlayer"
38 state: "stopped"
39- color: "black"
40
41 function stop() {
42 state = "stopped"

Subscribers

People subscribed via source and target branches