mediaplayer-app

Merge lp:~renatofilho/mediaplayer-app/fix-click-to-seek into lp:mediaplayer-app

  1. fix-click-to-seek
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho on 2016-11-29
Status: Merged
Approved by: Jim Hodapp on 2016-12-01
Approved revision: 433
Merged at revision: 434
Proposed branch: lp:~renatofilho/mediaplayer-app/fix-click-to-seek
Merge into: lp:mediaplayer-app
Prerequisite: lp:~renatofilho/mediaplayer-app/unity8-desktop-mode
Diff against target: 33 lines (+4/-4)
2 files modified
snapcraft.yaml (+3/-3)
src/qml/player/TimeLine.qml (+1/-1)
To merge this branch: bzr merge lp:~renatofilho/mediaplayer-app/fix-click-to-seek
Reviewer Review Type Date Requested Status
Jim Hodapp code 2016-11-29 Approve on 2016-12-01
system-apps-ci-bot continuous-integration 2016-11-29 Approve on 2016-12-01
Review via email: mp+312055@code.launchpad.net

Commit Message

Fix click to seek.
Add 'unity8' snap interface into the list (preparation for unity8 integration)

To post a comment you must log in.
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:431
https://jenkins.canonical.com/system-apps/job/lp-mediaplayer-app-ci/29/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2075
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/508
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2078
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1908
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1908/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1908
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1908/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1908
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1908/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1908
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1908/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1908
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1908/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1908
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1908/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1908
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1908/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1908
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1908/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1908
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1908/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-mediaplayer-app-ci/29/rebuild

review: Approve (continuous-integration)
lp:~renatofilho/mediaplayer-app/fix-click-to-seek updated on 2016-12-01
432. By Renato Araujo Oliveira Filho on 2016-12-01

Trunk merged.

433. By Renato Araujo Oliveira Filho on 2016-12-01

added 'unity8' interface into the snap list.

system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:432
https://jenkins.canonical.com/system-apps/job/lp-mediaplayer-app-ci/30/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2091
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/511
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2094
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1923
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1923/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1923
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1923/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1923
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1923/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1923
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1923/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1923
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1923/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1923
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1923/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1923
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1923/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1923
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1923/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1923
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1923/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-mediaplayer-app-ci/30/rebuild

review: Approve (continuous-integration)
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:433
https://jenkins.canonical.com/system-apps/job/lp-mediaplayer-app-ci/31/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2094
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/512
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2097
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1925
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1925/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1925
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1925/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1925
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1925/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1925
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1925/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1925
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1925/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1925
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1925/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1925
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1925/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1925
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1925/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1925
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1925/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-mediaplayer-app-ci/31/rebuild

review: Approve (continuous-integration)
Jim Hodapp (jhodapp) wrote :

LGTM

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'snapcraft.yaml'
2--- snapcraft.yaml 2016-11-24 18:54:49 +0000
3+++ snapcraft.yaml 2016-12-01 14:01:56 +0000
4@@ -5,13 +5,13 @@
5 A QML media player that can play audio/video sources.
6 Please find the source at:
7 https://code.launchpad.net/mediaplayer-app
8-confinement: strict
9-grade: devel
10+confinement: devmode
11+grade: stable
12
13 apps:
14 mediaplayer-app:
15 command: desktop-launch $SNAP/bin/mediaplayer-app --desktop_file_hint=unity8 $@
16- plugs: [mpris, opengl, platform, unity7, home]
17+ plugs: [mpris, opengl, platform, unity7, home, unity8]
18
19 plugs:
20 platform:
21
22=== modified file 'src/qml/player/TimeLine.qml'
23--- src/qml/player/TimeLine.qml 2016-02-19 11:14:53 +0000
24+++ src/qml/player/TimeLine.qml 2016-12-01 14:01:56 +0000
25@@ -67,7 +67,7 @@
26 {
27 // On EndOfMedia status, make sure the slider returns to the beginning
28 _slider.value = 0
29- } else {
30+ } else if (!_slider.pressed){
31 // Else, pass all new positions through to the slider UI
32 if (_slider.videoPosition >= (_slider.finalSeekPosition / 1000)) {
33 _slider.value = _slider.videoPosition

Subscribers

People subscribed via source and target branches