jsonrpc: rename Player.Repeat to Player.SetRepeat with "repeat" param…

…eter In addition to "off", "one" and "all" the "repeat" parameter can also take "cycle" as a value to cycle through the three repeat states.
avdleeuw · Oct 1, 2012 · ccb188c · ccb188c
1 parent accafc5
commit ccb188c
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 8 deletions.
diff --git a/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp b/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp
@@ -71,7 +71,7 @@ JsonRpcMethodMap CJSONServiceDescription::m_methodMaps[] = {
   { "Player.GoNext",                                CPlayerOperations::GoNext },
   { "Player.GoTo",                                  CPlayerOperations::GoTo },
   { "Player.SetShuffle",                            CPlayerOperations::SetShuffle },
-  { "Player.Repeat",                                CPlayerOperations::Repeat },
+  { "Player.SetRepeat",                             CPlayerOperations::SetRepeat },
   { "Player.SetPartymode",                          CPlayerOperations::SetPartymode },
 
   { "Player.SetAudioStream",                        CPlayerOperations::SetAudioStream },

diff --git a/xbmc/interfaces/json-rpc/PlayerOperations.cpp b/xbmc/interfaces/json-rpc/PlayerOperations.cpp
@@ -631,15 +631,33 @@ JSONRPC_STATUS CPlayerOperations::SetShuffle(const CStdString &method, ITranspor
   return ACK;
 }
 
-JSONRPC_STATUS CPlayerOperations::Repeat(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
+JSONRPC_STATUS CPlayerOperations::SetRepeat(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
 {
   switch (GetPlayer(parameterObject["playerid"]))
   {
     case Video:
     case Audio:
-      CApplicationMessenger::Get().PlayListPlayerRepeat(GetPlaylist(GetPlayer(parameterObject["playerid"])), (REPEAT_STATE)ParseRepeatState(parameterObject["state"]));
+    {
+      REPEAT_STATE repeat = REPEAT_NONE;
+      int playlistid = GetPlaylist(GetPlayer(parameterObject["playerid"]));
+      if (parameterObject["repeat"].asString() == "cycle")
+      {
+        REPEAT_STATE repeatPrev = g_playlistPlayer.GetRepeat(playlistid);
+        repeat = repeatPrev;
+        if (repeatPrev == REPEAT_NONE)
+          repeat = REPEAT_ALL;
+        else if (repeatPrev == REPEAT_ALL)
+          repeat = REPEAT_ONE;
+        else
+          repeat = REPEAT_NONE;
+      }
+      else
+        repeat = (REPEAT_STATE)ParseRepeatState(parameterObject["repeat"]);
+
+      CApplicationMessenger::Get().PlayListPlayerRepeat(playlistid, repeat);
       OnPlaylistChanged();
       break;
+    }
 
     case Picture:
     default:

diff --git a/xbmc/interfaces/json-rpc/PlayerOperations.h b/xbmc/interfaces/json-rpc/PlayerOperations.h
@@ -56,7 +56,7 @@ namespace JSONRPC
     static JSONRPC_STATUS GoNext(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS GoTo(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS SetShuffle(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
-    static JSONRPC_STATUS Repeat(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
+    static JSONRPC_STATUS SetRepeat(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS SetPartymode(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
 
     static JSONRPC_STATUS SetAudioStream(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);

diff --git a/xbmc/interfaces/json-rpc/ServiceDescription.h b/xbmc/interfaces/json-rpc/ServiceDescription.h
@@ -1395,14 +1395,19 @@ namespace JSONRPC
       "],"
       "\"returns\": \"string\""
     "}",
-    "\"Player.Repeat\": {"
+    "\"Player.SetRepeat\": {"
       "\"type\": \"method\","
       "\"description\": \"Set the repeat mode of the player\","
       "\"transport\": \"Response\","
       "\"permission\": \"ControlPlayback\","
       "\"params\": ["
         "{ \"name\": \"playerid\", \"$ref\": \"Player.Id\", \"required\": true },"
-        "{ \"name\": \"state\", \"$ref\": \"Player.Repeat\", \"required\": true }"
+        "{ \"name\": \"repeat\", \"type\": ["
+            "{ \"$ref\": \"Player.Repeat\", \"required\": true },"
+            "{ \"type\": \"string\", \"enum\": [ \"cycle\" ], \"required\": true }"
+          "],"
+          "\"required\": true"
+        "}"
       "],"
       "\"returns\": \"string\""
     "}",

diff --git a/xbmc/interfaces/json-rpc/methods.json b/xbmc/interfaces/json-rpc/methods.json
@@ -328,14 +328,19 @@
     ],
     "returns": "string"
   },
-  "Player.Repeat": {
+  "Player.SetRepeat": {
     "type": "method",
     "description": "Set the repeat mode of the player",
     "transport": "Response",
     "permission": "ControlPlayback",
     "params": [
       { "name": "playerid", "$ref": "Player.Id", "required": true },
-      { "name": "state", "$ref": "Player.Repeat", "required": true }
+      { "name": "repeat", "type": [
+          { "$ref": "Player.Repeat", "required": true },
+          { "type": "string", "enum": [ "cycle" ], "required": true }
+        ],
+        "required": true
+      }
     ],
     "returns": "string"
   },