Merge pull request #2248 from Tolriq/compilationartist

jsonrpc: add compilationartist property to AudioLibrary.GetArtists

diff --combined xbmc/interfaces/json-rpc/FileItemHandler.cpp
index cf7059b,bf33bbb..58efd23
--- 1/xbmc/interfaces/json-rpc/FileItemHandler.cpp
--- 2/xbmc/interfaces/json-rpc/FileItemHandler.cpp
+++ b/xbmc/interfaces/json-rpc/FileItemHandler.cpp
@@@ -233,7 -233,6 +233,6 @@@ void CFileItemHandler::HandleFileItemLi
  
    for (int i = start; i < end; i++)
    {
-     CVariant object;
      CFileItemPtr item = items.Get(i);
      HandleFileItem(ID, allowFile, resultname, item, parameterObject, fields, result, true, thumbLoader);
    }
@@@ -306,11 -305,6 +305,11 @@@ void CFileItemHandler::HandleFileItem(c
  
          if (!object.isMember("type"))
            object["type"] = "unknown";
 +
 +        if (item->m_bIsFolder)
 +          object["filetype"] = "directory";
 +        else 
 +          object["filetype"] = "file";
        }
      }
  

diff --combined xbmc/interfaces/json-rpc/ServiceDescription.h
index 7bb3bd0,144b037..a446a0d
--- 1/xbmc/interfaces/json-rpc/ServiceDescription.h
--- 2/xbmc/interfaces/json-rpc/ServiceDescription.h
+++ b/xbmc/interfaces/json-rpc/ServiceDescription.h
@@@ -22,7 -22,7 +22,7 @@@
  namespace JSONRPC
  {
    const char* const JSONRPC_SERVICE_ID          = "http://www.xbmc.org/jsonrpc/ServiceDescription.json";
 -  const char* const JSONRPC_SERVICE_VERSION     = "6.0.1";
 +  const char* const JSONRPC_SERVICE_VERSION     = "6.1.0";
    const char* const JSONRPC_SERVICE_DESCRIPTION = "JSON-RPC API of XBMC";
  
    const char* const JSONRPC_SERVICE_TYPES[] = {  
@@@ -413,7 -413,7 +413,7 @@@
          "\"enum\": [ \"instrument\", \"style\", \"mood\", \"born\", \"formed\","
                    "\"description\", \"genre\", \"died\", \"disbanded\","
                    "\"yearsactive\", \"musicbrainzartistid\", \"fanart\","
-                   "\"thumbnail\" ]"
+                   "\"compilationartist\", \"thumbnail\" ]"
        "}"
      "}",
      "\"Audio.Fields.Album\": {"
@@@ -474,6 -474,7 +474,7 @@@
          "\"died\": { \"type\": \"string\" },"
          "\"disbanded\": { \"type\": \"string\" },"
          "\"yearsactive\": { \"$ref\": \"Array.String\" },"
+         "\"compilationartist\": { \"type\": \"boolean\" },"
          "\"musicbrainzartistid\": { \"type\": \"string\" }"
        "}"
      "}",
@@@ -1134,8 -1135,7 +1135,8 @@@
                  "\"xbmc.metadata.scraper.musicvideos\", \"xbmc.metadata.scraper.tvshows\", \"xbmc.ui.screensaver\","
                  "\"xbmc.player.musicviz\", \"xbmc.python.pluginsource\", \"xbmc.python.script\", \"xbmc.python.weather\","
                  "\"xbmc.python.subtitles\", \"xbmc.python.lyrics\", \"xbmc.gui.skin\", \"xbmc.gui.webinterface\","
 -                "\"xbmc.addon.video\", \"xbmc.addon.audio\", \"xbmc.addon.image\", \"xbmc.addon.executable\", \"xbmc.service\" ],"
 +                "\"xbmc.pvrclient\", \"xbmc.addon.video\", \"xbmc.addon.audio\", \"xbmc.addon.image\", \"xbmc.addon.executable\","
 +                "\"xbmc.service\" ],"
        "\"default\": \"unknown\""
      "}",
      "\"Addon.Content\": {"
@@@ -1794,8 -1794,7 +1795,8 @@@
          "{ \"name\": \"directory\", \"type\": \"string\", \"required\": true },"
          "{ \"name\": \"media\", \"$ref\": \"Files.Media\", \"default\": \"files\" },"
          "{ \"name\": \"properties\", \"$ref\": \"List.Fields.Files\" },"
 -        "{ \"name\": \"sort\", \"$ref\": \"List.Sort\" }"
 +        "{ \"name\": \"sort\", \"$ref\": \"List.Sort\" },"
 +        "{ \"name\": \"limits\", \"$ref\": \"List.Limits\", \"description\": \"Limits are applied after getting the directory content thus retrieval is not faster when they are applied.\" }"
        "],"
        "\"returns\": {"
          "\"type\": \"object\","

diff --combined xbmc/interfaces/json-rpc/types.json
index a2efe43,b8994df..db4f4c3
--- 1/xbmc/interfaces/json-rpc/types.json
--- 2/xbmc/interfaces/json-rpc/types.json
+++ b/xbmc/interfaces/json-rpc/types.json
@@@ -386,7 -386,7 +386,7 @@@
        "enum": [ "instrument", "style", "mood", "born", "formed",
                  "description", "genre", "died", "disbanded",
                  "yearsactive", "musicbrainzartistid", "fanart",
-                 "thumbnail" ]
+                 "thumbnail", "compilationartist" ]
      }
    },
    "Audio.Fields.Album": {
@@@ -447,6 -447,7 +447,7 @@@
        "died": { "type": "string" },
        "disbanded": { "type": "string" },
        "yearsactive": { "$ref": "Array.String" },
+       "compilationartist": { "type": "boolean" },
        "musicbrainzartistid": { "type": "string" }
      }
    },
@@@ -1107,8 -1108,7 +1108,8 @@@
                "xbmc.metadata.scraper.musicvideos", "xbmc.metadata.scraper.tvshows", "xbmc.ui.screensaver",
                "xbmc.player.musicviz", "xbmc.python.pluginsource", "xbmc.python.script", "xbmc.python.weather",
                "xbmc.python.subtitles", "xbmc.python.lyrics", "xbmc.gui.skin", "xbmc.gui.webinterface",
 -              "xbmc.addon.video", "xbmc.addon.audio", "xbmc.addon.image", "xbmc.addon.executable", "xbmc.service" ],
 +              "xbmc.pvrclient", "xbmc.addon.video", "xbmc.addon.audio", "xbmc.addon.image", "xbmc.addon.executable",
 +              "xbmc.service" ],
      "default": "unknown"
    },
    "Addon.Content": {