Merge lp:~ahayzen/music-app/remix-seeking-workaround into lp:music-app/remix

[Andrew Hayzen]

* Ignore first value back after seeking [Workaround]

* Ignore first value back after seeking [Workaround]

Until it is fixed in media-hub ignore the first value back so the progress bar doesn't jump to 0 and then to the real position. Note this is a *workaround*.

[Victor Thompson (vthompson)]

I'll test this out in around 5 hours or so. I think we should also document in commentary that this is a workaround for lp:1310706. Probably on "onPositionChanged".

review: Needs Fixing

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:656
http://91.189.93.70:8080/job/music-app-remix-ci/51/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/775
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/775/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/51

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/51/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

This does work quite nicely on my mako device. There does seem to be one small issue though. When the music is paused and the user taps or drags the progress handle it always shows the previous position, rather than the current one.

review: Needs Fixing

[Andrew Hayzen (ahayzen)]

I believe this maybe be happening in lp:music-app/remix as well, possible when we moved to using Slider - I'll investigate and if I find a fix it in this mp.

[lp:~ahayzen/music-app/remix-seeking-workaround]

657. By Andrew Hayzen on 2014-10-09

* Fix for label not updating while seeking
* Add code comments

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:657
http://91.189.93.70:8080/job/music-app-remix-ci/62/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/801
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/801/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/62

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/62/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

LGTM!

review: Approve

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-10-08 18:33:38 +0000
+++ MusicNowPlaying.qml	2014-10-09 16:32:12 +0000
@@ -201,9 +201,17 @@
                     anchors.left: parent.left
                     anchors.right: parent.right
                     objectName: "progressSliderShape"
-                    function formatValue(v) { return durationToString(v) }
+
+                    function formatValue(v) {
+                        if (seeking) {  // update position label while dragging
+                            musicToolbarFullPositionLabel.text = durationToString(v)
+                        }
+
+                        return durationToString(v)
+                    }
 
                     property bool seeking: false
+                    property bool seeked: false
 
                     onSeekingChanged: {
                         if (seeking === false) {
@@ -218,7 +226,8 @@
                     onPressedChanged: {
                         seeking = pressed
                         if (!pressed) {
-                           player.seek(value)
+                            seeked = true
+                            player.seek(value)
                        }
                     }
 
@@ -229,11 +238,14 @@
                             progressSliderMusic.maximumValue = player.duration
                         }
                         onPositionChanged: {
-                            if (progressSliderMusic.seeking === false) {
+                            // seeked is a workaround for bug 1310706 as the first position after a seek is sometimes invalid (0)
+                            if (progressSliderMusic.seeking === false && !progressSliderMusic.seeked) {
                                 progressSliderMusic.value = player.position
                                 musicToolbarFullPositionLabel.text = durationToString(player.position)
                                 musicToolbarFullDurationLabel.text = durationToString(player.duration)
                             }
+
+                            progressSliderMusic.seeked = false;
                         }
                         onStopped: {
                             musicToolbarFullPositionLabel.text = durationToString(0);