Merge lp:~marcustomlinson/unity-scope-mediascanner/my-music-cardinality into lp:unity-scope-mediascanner

[Marcus Tomlinson]

Fix My Music "concierge" card and render 3 results in the "My Music" category of the Music aggregator (as per design)

[Paweł Stołowski (stolowski)]

Looks good, thanks!

review: Approve

[Paweł Stołowski (stolowski)]

+1

review: Approve

=== modified file 'src/musicaggregator/musicaggregatorquery.cpp'
--- src/musicaggregator/musicaggregatorquery.cpp	2016-01-13 16:36:09 +0000
+++ src/musicaggregator/musicaggregatorquery.cpp	2016-01-28 13:20:56 +0000
@@ -348,7 +348,7 @@
         {
             if (empty_search)
             {
-                metadata.set_cardinality(4);
+                metadata.set_cardinality(3);
             }
         }
         else if (scopes[i].id == MusicAggregatorScope::SOUNDCLOUD)

=== modified file 'src/mymusic/music-scope.cpp'
--- src/mymusic/music-scope.cpp	2016-01-13 04:26:08 +0000
+++ src/mymusic/music-scope.cpp	2016-01-28 13:20:56 +0000
@@ -61,7 +61,7 @@
     "title": "title",
     "art": {
         "field": "art",
-        "conciergeMode": true,
+        "conciergeMode": true
     },
     "summary" : "summary"
   }
@@ -152,6 +152,7 @@
   "template": {
     "category-layout": "grid",
     "card-size": "large",
+    "collapsed-rows": 3,
     "card-layout": "horizontal",
     "quick-preview-type" : "audio"
   },