Merge lp:~ahayzen/music-app/basic-repeat-implementation into lp:music-app/trusty

[Andrew Hayzen]

* Implementation of a basic optional repeat system

* Implementation of a basic optional repeat system

[Victor Thompson (vthompson)]

There's some odd stuff happening when I turn on or off repeat and/or shuffle. I'll look into it, but I apologize for allowing this to break. It needs to be fixed before we release.

[Victor Thompson (vthompson)]

review: Needs Fixing

[Andrew Hayzen (ahayzen)]

Victor, could you expand on 'odd stuff happening' cause this was working under testing yesterday.

[Andrew Hayzen (ahayzen)]

Note that shuffle requires a restart to be taken into affect in this branch, however this had been fixed in lp:~music-app-dev/music-app/expandable-and-more

All this branch does is make getSong() actually take the repeat into account.

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

PASSED: Continuous integration, rev:170
http://91.189.93.70:8080/job/music-app-ci/153/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/897
    SUCCESS: http://91.189.93.70:8080/job/music-app-precise-amd64-ci/153
    SUCCESS: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/153
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/153
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/153

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Ok, this looks good. I misunderstood the intent. I thought repeat was the portion of the design for "repeat current item" not repeat the list. This is fine.

[Victor Thompson (vthompson)]

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/music-app-autolanding/251/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/917
    SUCCESS: http://91.189.93.70:8080/job/music-app-precise-amd64-autolanding/250
    SUCCESS: http://91.189.93.70:8080/job/music-app-quantal-amd64-autolanding/250
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-autolanding/250
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-autolanding/250

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

Andrew, could we also either a) comment out the "Shuf" and "Rep" UbuntuShapes from the MusicToolbar or b) find icons for them? It's still valuable to have the implementation for repeat ready... but if this is to land I think we also need to do a) or b) above.

[Victor Thompson (vthompson)]

I did the icon work in the other branch. I think both of these branches need to land prior to our 1.0 release. Once that happens we are in a good place.

We do have one bug that I believe is latent and needs to be fixed. Occasionally when the now playing view is launched, the tab header re-appears and covers the back button at the top of the view. This makes it impossible to go back to the other views. The user can only select songs within the queue until they restart the app.

[David Planella (dpm)]

Now that lp:~music-app-dev/music-app/expandable-and-more has landed, this one needs to be merged with trunk.

review: Needs Fixing

[lp:~ahayzen/music-app/basic-repeat-implementation]

171. By Andrew Hayzen on 2013-10-12

* Merge of trunk

172. By Andrew Hayzen on 2013-10-12

* Fix for manifest.json

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

FAILED: Continuous integration, rev:172
http://91.189.93.70:8080/job/music-app-ci/172/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/927
    SUCCESS: http://91.189.93.70:8080/job/music-app-precise-amd64-ci/172
    SUCCESS: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/172
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/172
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/174

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

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

Ok think this is ready to go.

Victor, regarding that bug, Daniel spotted it the other day and added a Back option in the HUD as a fallback. But I agree it would be nice to fix.

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

review: Approve (continuous-integration)

[David Planella (dpm)]

review: Approve

=== modified file 'MusicToolbar.qml'
--- MusicToolbar.qml	2013-10-12 01:07:17 +0000
+++ MusicToolbar.qml	2013-10-12 15:29:50 +0000
@@ -526,6 +526,8 @@
                     onClicked: {
                         // Invert shuffle settings
                         Settings.setSetting("shuffle", !(Settings.getSetting("shuffle") === "1"))
+                        console.debug("Shuffle:", Settings.getSetting("shuffle") === "1")
+
                         mainView.random = Settings.getSetting("shuffle") === "1"
                         shuffleIcon.opacity = Settings.getSetting("shuffle") === "1" ? 1 : .25
                     }
@@ -681,6 +683,7 @@
                     onClicked: {
                         // Invert repeat settings
                         Settings.setSetting("repeat", !(Settings.getSetting("repeat") === "1"))
+                        console.debug("Repeat:", Settings.getSetting("repeat") === "1")
                         repeatIcon.opacity = Settings.getSetting("repeat") === "1" ? 1 : .25
                     }
                 }

=== modified file 'manifest.json'
--- manifest.json	2013-10-12 01:39:53 +0000
+++ manifest.json	2013-10-12 15:29:50 +0000
@@ -14,3 +14,4 @@
     "title": "music", 
     "version": "1.0"
 }
+

=== modified file 'music-app.qml'
--- music-app.qml	2013-10-12 01:50:13 +0000
+++ music-app.qml	2013-10-12 15:29:50 +0000
@@ -295,17 +295,23 @@
                 console.log("trackQueue.count: " + trackQueue.model.count)
                 currentIndex += direction
                 player.source = Qt.resolvedUrl(trackQueue.model.get(currentIndex).file)
-            } else if(direction === 1) {
+            } else if(direction === 1 && Settings.getSetting("repeat") === "1") {
                 console.log("currentIndex: " + currentIndex)
                 console.log("trackQueue.count: " + trackQueue.model.count)
                 currentIndex = 0
                 player.source = Qt.resolvedUrl(trackQueue.model.get(currentIndex).file)
-            } else if(direction === -1) {
+            } else if(direction === -1 && Settings.getSetting("repeat") === "1") {
                 console.log("currentIndex: " + currentIndex)
                 console.log("trackQueue.count: " + trackQueue.model.count)
                 currentIndex = trackQueue.model.count - 1
                 player.source = Qt.resolvedUrl(trackQueue.model.get(currentIndex).file)
             }
+            else
+            {
+                player.stop()
+                return;
+            }
+
             console.log("MediaPlayer statusChanged, currentIndex: " + currentIndex)
         }
         player.stop()  // Add stop so that if same song is selected it restarts