jsonrpc: add "channelid" property to Player.Open's "item" parameter t…

…o start a PVR channel
Montellese · Oct 16, 2012 · d5e3a2f · d5e3a2f
1 parent 74bf281
commit d5e3a2f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/xbmc/interfaces/json-rpc/PlayerOperations.cpp b/xbmc/interfaces/json-rpc/PlayerOperations.cpp
@@ -39,6 +39,7 @@
 #include "epg/EpgInfoTag.h"
 #include "pvr/PVRManager.h"
 #include "pvr/channels/PVRChannel.h"
+#include "pvr/channels/PVRChannelGroupsContainer.h"
 
 using namespace JSONRPC;
 using namespace PLAYLIST;
@@ -475,6 +476,22 @@ JSONRPC_STATUS CPlayerOperations::Open(const CStdString &method, ITransportLayer
     CApplicationMessenger::Get().ExecBuiltIn("playercontrol(partymode(" + parameterObject["item"]["partymode"].asString() + "))");
     return ACK;
   }
+  else if (parameterObject["item"].isObject() && parameterObject["item"].isMember("channelid"))
+  {
+    if (!g_PVRManager.IsStarted())
+      return FailedToExecute;
+
+    CPVRChannelGroupsContainer *channelGroupContainer = g_PVRChannelGroups;
+    if (channelGroupContainer == NULL)
+      return FailedToExecute;
+
+    CPVRChannelPtr channel = channelGroupContainer->GetChannelById((int)parameterObject["item"]["channelid"].asInteger());
+    if (channel == NULL)
+      return InvalidParams;
+
+    CApplicationMessenger::Get().PlayFile(CFileItem(*channel.get()));
+    return ACK;
+  }
   else
   {
     CFileItemList list;

diff --git a/xbmc/interfaces/json-rpc/ServiceDescription.h b/xbmc/interfaces/json-rpc/ServiceDescription.h
@@ -1356,6 +1356,11 @@ namespace JSONRPC
                   "]"
                 "}"
               "}"
+            "},"
+            "{ \"type\": \"object\", \"required\": true, \"additionalProperties\": false,"
+              "\"properties\": {"
+                "\"channelid\": { \"$ref\": \"Library.Id\", \"required\": true }"
+              "}"
             "}"
           "]"
         "},"

diff --git a/xbmc/interfaces/json-rpc/methods.json b/xbmc/interfaces/json-rpc/methods.json
@@ -131,6 +131,11 @@
                 ]
               }
             }
+          },
+          { "type": "object", "required": true, "additionalProperties": false,
+            "properties": {
+              "channelid": { "$ref": "Library.Id", "required": true }
+            }
           }
         ]
       },