aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Montellese <sascha.montellese@gmail.com>2015-02-01 11:57:33 +0100
committerSascha Montellese <sascha.montellese@gmail.com>2015-02-01 11:57:33 +0100
commitbdb94c1cb2619d904e02af9902f800f4bc0d71c3 (patch)
treeeb90abdc7d29b99a6fbe0c8b07678b85b35d93b2
parentb8df6351f813bf48f01c5272460438c010ac29da (diff)
parent295297d177171c02f903844032bcf3aec813b056 (diff)
Merge pull request #5906 from p2kmgcl/jsonrpcScrobbling
JSON-RPC: add playcount and lastplayed to "AudioLibrary.SetSongDetails"
-rw-r--r--xbmc/interfaces/json-rpc/AudioLibrary.cpp4
-rw-r--r--xbmc/interfaces/json-rpc/schema/methods.json4
-rw-r--r--xbmc/interfaces/json-rpc/schema/version.txt2
3 files changed, 8 insertions, 2 deletions
diff --git a/xbmc/interfaces/json-rpc/AudioLibrary.cpp b/xbmc/interfaces/json-rpc/AudioLibrary.cpp
index 4ffcde9387..40d3e4f54f 100644
--- a/xbmc/interfaces/json-rpc/AudioLibrary.cpp
+++ b/xbmc/interfaces/json-rpc/AudioLibrary.cpp
@@ -508,6 +508,10 @@ JSONRPC_STATUS CAudioLibrary::SetSongDetails(const std::string &method, ITranspo
song.strComment = parameterObject["comment"].asString();
if (ParameterNotNull(parameterObject, "musicbrainztrackid"))
song.strMusicBrainzTrackID = parameterObject["musicbrainztrackid"].asString();
+ if (ParameterNotNull(parameterObject, "playcount"))
+ song.iTimesPlayed = parameterObject["playcount"].asInteger();
+ if (ParameterNotNull(parameterObject, "lastplayed"))
+ song.lastPlayed.SetFromDBDateTime(parameterObject["lastplayed"].asString());
if (musicdatabase.UpdateSong(id, song) <= 0)
return InternalError;
diff --git a/xbmc/interfaces/json-rpc/schema/methods.json b/xbmc/interfaces/json-rpc/schema/methods.json
index 37c0373d94..024316e9a9 100644
--- a/xbmc/interfaces/json-rpc/schema/methods.json
+++ b/xbmc/interfaces/json-rpc/schema/methods.json
@@ -920,7 +920,9 @@
{ "name": "musicbrainztrackid", "$ref": "Optional.String" },
{ "name": "musicbrainzartistid", "$ref": "Optional.String" },
{ "name": "musicbrainzalbumid", "$ref": "Optional.String" },
- { "name": "musicbrainzalbumartistid", "$ref": "Optional.String" }
+ { "name": "musicbrainzalbumartistid", "$ref": "Optional.String" },
+ { "name": "playcount", "$ref": "Optional.Integer" },
+ { "name": "lastplayed", "$ref": "Optional.String" }
],
"returns": "string"
},
diff --git a/xbmc/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt
index facac91deb..fe6750473a 100644
--- a/xbmc/interfaces/json-rpc/schema/version.txt
+++ b/xbmc/interfaces/json-rpc/schema/version.txt
@@ -1 +1 @@
-6.21.2
+6.22.0