Skip to content
This repository
Browse code

Merge pull request #2248 from Tolriq/compilationartist

jsonrpc: add compilationartist property to AudioLibrary.GetArtists
  • Loading branch information...
commit cc985c8007ce607f72457b59bcfad274022a0c32 2 parents fb7811d + 50b22ba
Sascha Montellese authored March 07, 2013
1  xbmc/interfaces/json-rpc/FileItemHandler.cpp
@@ -233,7 +233,6 @@ void CFileItemHandler::HandleFileItemList(const char *ID, bool allowFile, const
233 233
 
234 234
   for (int i = start; i < end; i++)
235 235
   {
236  
-    CVariant object;
237 236
     CFileItemPtr item = items.Get(i);
238 237
     HandleFileItem(ID, allowFile, resultname, item, parameterObject, fields, result, true, thumbLoader);
239 238
   }
3  xbmc/interfaces/json-rpc/ServiceDescription.h
@@ -413,7 +413,7 @@ namespace JSONRPC
413 413
         "\"enum\": [ \"instrument\", \"style\", \"mood\", \"born\", \"formed\","
414 414
                   "\"description\", \"genre\", \"died\", \"disbanded\","
415 415
                   "\"yearsactive\", \"musicbrainzartistid\", \"fanart\","
416  
-                  "\"thumbnail\" ]"
  416
+                  "\"compilationartist\", \"thumbnail\" ]"
417 417
       "}"
418 418
     "}",
419 419
     "\"Audio.Fields.Album\": {"
@@ -474,6 +474,7 @@ namespace JSONRPC
474 474
         "\"died\": { \"type\": \"string\" },"
475 475
         "\"disbanded\": { \"type\": \"string\" },"
476 476
         "\"yearsactive\": { \"$ref\": \"Array.String\" },"
  477
+        "\"compilationartist\": { \"type\": \"boolean\" },"
477 478
         "\"musicbrainzartistid\": { \"type\": \"string\" }"
478 479
       "}"
479 480
     "}",
3  xbmc/interfaces/json-rpc/types.json
@@ -386,7 +386,7 @@
386 386
       "enum": [ "instrument", "style", "mood", "born", "formed",
387 387
                 "description", "genre", "died", "disbanded",
388 388
                 "yearsactive", "musicbrainzartistid", "fanart",
389  
-                "thumbnail" ]
  389
+                "thumbnail", "compilationartist" ]
390 390
     }
391 391
   },
392 392
   "Audio.Fields.Album": {
@@ -447,6 +447,7 @@
447 447
       "died": { "type": "string" },
448 448
       "disbanded": { "type": "string" },
449 449
       "yearsactive": { "$ref": "Array.String" },
  450
+      "compilationartist": { "type": "boolean" },
450 451
       "musicbrainzartistid": { "type": "string" }
451 452
     }
452 453
   },
1  xbmc/music/tags/MusicInfoTag.cpp
@@ -591,6 +591,7 @@ void CMusicInfoTag::Serialize(CVariant& value) const
591 591
   value["lastplayed"] = m_lastPlayed.IsValid() ? m_lastPlayed.GetAsDBDateTime() : StringUtils::EmptyString;
592 592
   value["lyrics"] = m_strLyrics;
593 593
   value["albumid"] = m_iAlbumId;
  594
+  value["compilationartist"] = m_bCompilation;
594 595
 }
595 596
 
596 597
 void CMusicInfoTag::ToSortable(SortItem& sortable)

0 notes on commit cc985c8

Please sign in to comment.
Something went wrong with that request. Please try again.