Merge lp:~vthompson/music-app/fix-blank-cover-art-and-misc into lp:music-app/trusty

[Victor Thompson]

Changes:
* Fix icons and images when cover art is not available.
* Fix issue with scrobble that prevented the next track from being played.
* Place the current path at the bottom of the screen in the LibraryLoader so it is always visible.

Changes:
* Fix icons and images when cover art is not available.
* Fix issue with scrobble that prevented the next track from being played.
* Place the current path at the bottom of the screen in the LibraryLoader so it is always visible.

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

PASSED: Continuous integration, rev:33
http://91.189.93.125:8080/job/music-app-ci/26/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/music-app-quantal-amd64-ci/26
    SUCCESS: http://91.189.93.125:8080/job/music-app-raring-amd64-ci/26

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/music-app-ci/26/rebuild

review: Approve (continuous-integration)

[lp:~vthompson/music-app/fix-blank-cover-art-and-misc]

34. By Victor Thompson on 2013-06-21

for some reason extracting deb files do not like invalid email addresses.

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

PASSED: Continuous integration, rev:34
http://91.189.93.125:8080/job/music-app-ci/27/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/music-app-quantal-amd64-ci/27
    SUCCESS: http://91.189.93.125:8080/job/music-app-raring-amd64-ci/27

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/music-app-ci/27/rebuild

review: Approve (continuous-integration)

[Daniel Holm (danielholm)]

It looks great.

review: Approve

=== modified file 'LibraryLoader.qml'
--- LibraryLoader.qml	2013-06-16 17:09:19 +0000
+++ LibraryLoader.qml	2013-06-21 00:55:29 +0000
@@ -100,7 +100,6 @@
     ListView {
         id: folderSelecterList
         anchors.fill: parent
-        anchors.topMargin: units.gu(3)
 
         model: folderModel
         delegate: folderSelecterDelegate
@@ -178,7 +177,11 @@
                     Component.onCompleted: {
                         if (!model.isDir) {
                             console.log("Debug: Scanner fileDelegate onComplete")
-                            Library.setMetadata(filePath, trackTitle, trackArtist, trackAlbum, "image://cover-art/" + filePath, trackYear, trackNumber, trackLength)
+                            if ("" === trackCover) {
+                                Library.setMetadata(filePath, trackTitle, trackArtist, trackAlbum, "", trackYear, trackNumber, trackLength)
+                            } else {
+                                Library.setMetadata(filePath, trackTitle, trackArtist, trackAlbum, "image://cover-art/" + filePath, trackYear, trackNumber, trackLength)
+                            }
                         }
                     }
                 }
@@ -189,6 +192,8 @@
     Rectangle {
         width: parent.width
         height: units.gu(3)
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: units.gu(8)
         Label {
             id: currentpath
             text: folderModel.path
 
=== modified file 'MusicTracks.qml'
--- MusicTracks.qml	2013-06-19 12:08:44 +0000
+++ MusicTracks.qml	2013-06-21 00:55:29 +0000
@@ -177,7 +177,7 @@
                     property string cover: model.cover
                     property string length: model.length
                     property string file: model.file
-                    icon: cover === "" ? (file.match("\\.mp3") ? Qt.resolvedUrl("images/audio-x-mpeg.png") : Qt.resolvedUrl("images/audio-x-vorbis+ogg.png")) : "image://cover-art/"+file
+                    icon: track.cover === "" ? (track.file.match("\\.mp3") ? Qt.resolvedUrl("images/audio-x-mpeg.png") : Qt.resolvedUrl("images/audio-x-vorbis+ogg.png")) : "image://cover-art/"+file
                     iconFrame: false
                     Label {
                         id: trackTitle
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-06-18 12:49:22 +0000
+++ debian/changelog	2013-06-21 00:55:29 +0000
@@ -21,7 +21,7 @@
 
   * Changing name of application to ubuntu-music-app
 
- -- Daniel Holm <daniel@daniel-laptop>  Tue, 04 Jun 2013 16:43:32 +0200
+ -- Daniel Holm <[e-mail]>  Tue, 04 Jun 2013 16:43:32 +0200
 
 music-app (0.2) raring; urgency=low
 
 
=== modified file 'music-app.qml'
--- music-app.qml	2013-06-19 12:08:44 +0000
+++ music-app.qml	2013-06-21 00:55:29 +0000
@@ -132,7 +132,7 @@
             if (status == MediaPlayer.EndOfMedia) {
                 // scrobble it
                 if (Settings.getSetting("scrobble") === "1") {
-                    scrobblemodel.scrobble(player.source,artist,timestamp)
+                    Scrobble.scrobble(player.source,artist,timestamp)
                 }
                 else {
                     console.debug("Debug: no scrobbling")