Ubuntu Music App

Merge lp:~vthompson/music-app/small-fix-and-depend-on-nemo-folderlistmodel into lp:music-app/trusty

  1. small-fix-and-depend-on-nemo-folderlistmodel
  2. Merge into trusty
Proposed by Victor Thompson
Status: Merged
Approved by: Victor Thompson
Approved revision: 30
Merged at revision: 29
Proposed branch: lp:~vthompson/music-app/small-fix-and-depend-on-nemo-folderlistmodel
Merge into: lp:music-app/trusty
Diff against target: 46 lines (+3/-4)
3 files modified
LibraryLoader.qml (+1/-2)
debian/control (+1/-1)
meta-database.js (+1/-1)
To merge this branch: bzr merge lp:~vthompson/music-app/small-fix-and-depend-on-nemo-folderlistmodel
Reviewer Review Type Date Requested Status
Victor Thompson Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+168834@code.launchpad.net

Commit message

Changed the following:
* Added a fix for when selecting the user's Music folder is done more than once while running the app
* Added a dependency on qtdeclarative5-nemo-qml-plugins-folderlistmodel

Description of the change

Changed the following:
* Added a fix for when selecting the user's Music folder is done more than once while running the app
* Added a dependency on qtdeclarative5-nemo-qml-plugins-folderlistmodel

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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

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

review: Approve (continuous-integration)
lp:~vthompson/music-app/small-fix-and-depend-on-nemo-folderlistmodel updated
30. By Victor Thompson

Reverse order of songs listed

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'LibraryLoader.qml'
2--- LibraryLoader.qml 2013-06-08 14:59:26 +0000
3+++ LibraryLoader.qml 2013-06-12 11:52:38 +0000
4@@ -56,8 +56,8 @@
5 Library.reset()
6 Library.initialize()
7 Settings.setSetting("currentfolder", folderModel.path)
8+ folderScannerModel.path = folderModel.path
9 folderScannerModel.nameFilters = ["*.mp3","*.ogg","*.flac","*.wav","*.oga"]
10- folderScannerModel.path = folderModel.path
11 timer.start()
12 }
13 }
14@@ -91,7 +91,6 @@
15 libraryModel.populate()
16 PlayingList.clear()
17 itemnum = 0
18- folderScannerModel.path = ""
19 timer.stop()
20 }
21 counted = filelist.count
22
23=== modified file 'debian/control'
24--- debian/control 2013-06-10 00:59:24 +0000
25+++ debian/control 2013-06-12 11:52:38 +0000
26@@ -8,6 +8,6 @@
27
28 Package: music-app
29 Architecture: all
30-Depends: ${misc:Depends},qtdeclarative5-folderlistmodel-plugin,qtdeclarative5-localstorage-plugin,qtdeclarative5-particles-plugin,qtdeclarative5-qtmultimedia-plugin,qtdeclarative5-qtquick2-plugin,qtdeclarative5-ubuntu-ui-toolkit-plugin|qt-components-ubuntu,qtdeclarative5-window-plugin,qtdeclarative5-xmllistmodel-plugin,${shlibs:Depends},qmlscene
31+Depends: ${misc:Depends},qtdeclarative5-nemo-qml-plugins-folderlistmodel,qtdeclarative5-localstorage-plugin,qtdeclarative5-particles-plugin,qtdeclarative5-qtmultimedia-plugin,qtdeclarative5-qtquick2-plugin,qtdeclarative5-ubuntu-ui-toolkit-plugin|qt-components-ubuntu,qtdeclarative5-window-plugin,qtdeclarative5-xmllistmodel-plugin,${shlibs:Depends},qmlscene
32 Description: Music player for Ubuntu Touch
33 Touch enabled music player for Ubuntu
34
35=== modified file 'meta-database.js'
36--- meta-database.js 2013-06-08 13:37:14 +0000
37+++ meta-database.js 2013-06-12 11:52:38 +0000
38@@ -102,7 +102,7 @@
39 var db = getDatabase();
40 db.transaction( function(tx) {
41 var rs = tx.executeSql("SELECT * FROM metadata");
42- for(var i = 0; i < rs.rows.length; i++) {
43+ for(var i = rs.rows.length - 1; i >= 0; i--) {
44 var dbItem = rs.rows.item(i);
45 console.log("Artist:"+ dbItem.artist + ", Album:"+dbItem.album + ", Title:"+dbItem.title + ", File:"+dbItem.file + ", Art:"+dbItem.cover);
46 res.push({artist:dbItem.artist, album:dbItem.album, title:dbItem.title, file:dbItem.file, cover:dbItem.cover, length:dbItem.length});

Subscribers

People subscribed via source and target branches

to status/vote changes: