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
=== modified file 'src/qml/player.qml'
--- src/qml/player.qml 2014-10-15 21:26:33 +0000
+++ src/qml/player.qml 2015-04-28 18:57:02 +0000
@@ -26,8 +26,7 @@
26import Ubuntu.Components 1.126import Ubuntu.Components 1.1
27import Ubuntu.Components.Popups 1.0 as Popups27import Ubuntu.Components.Popups 1.0 as Popups
2828
2929Item {
30Rectangle {
31 id: mediaPlayer30 id: mediaPlayer
32 width: screenWidth31 width: screenWidth
33 height: screenHeight32 height: screenHeight
@@ -81,7 +80,6 @@
81 source: "player/VideoPlayer.qml"80 source: "player/VideoPlayer.qml"
82 focus: true81 focus: true
83 anchors.fill: parent82 anchors.fill: parent
84 clip: true
85 onLoaded: {83 onLoaded: {
86 item.focus = true84 item.focus = true
87 item.rotating = Qt.binding(function () { return rotatingTransition.running } )85 item.rotating = Qt.binding(function () { return rotatingTransition.running } )
8886
=== modified file 'src/qml/player/AbstractPlayer.qml'
--- src/qml/player/AbstractPlayer.qml 2015-03-20 17:34:56 +0000
+++ src/qml/player/AbstractPlayer.qml 2015-04-28 18:57:02 +0000
@@ -23,7 +23,7 @@
23import "../common"23import "../common"
24import "../common/utils.js" as Utils24import "../common/utils.js" as Utils
2525
26Rectangle {26Item {
27 id: player27 id: player
2828
29 property bool playing: state == "playing"29 property bool playing: state == "playing"
@@ -44,7 +44,6 @@
4444
45 objectName: "videoPlayer"45 objectName: "videoPlayer"
46 state: "stopped"46 state: "stopped"
47 color: "black"
4847
49 function stop() {48 function stop() {
50 state = "stopped"49 state = "stopped"

Subscribers

People subscribed via source and target branches