FIX: JSON: Allow to receive "Input.*" notifications"

diff --git a/xbmc/interfaces/json-rpc/JSONRPC.cpp b/xbmc/interfaces/json-rpc/JSONRPC.cpp
index 0cd72dc..ce4b726 100644 (file)
--- a/xbmc/interfaces/json-rpc/JSONRPC.cpp
+++ b/xbmc/interfaces/json-rpc/JSONRPC.cpp
@@ -131,6 +131,9 @@ JSONRPC_STATUS CJSONRPC::SetConfiguration(const CStdString &method, ITransportLa
     if ((notifications["Application"].isNull() && (oldFlags & Other)) ||
         (notifications["Application"].isBoolean() && notifications["Application"].asBoolean()))
       flags |= Application;
+    if ((notifications["Input"].isNull() && (oldFlags & Input)) ||
+        (notifications["Input"].isBoolean() && notifications["Input"].asBoolean()))
+      flags |= Input;
     if ((notifications["Other"].isNull() && (oldFlags & Other)) ||
         (notifications["Other"].isBoolean() && notifications["Other"].asBoolean()))
       flags |= Other;

diff --git a/xbmc/interfaces/json-rpc/ServiceDescription.h b/xbmc/interfaces/json-rpc/ServiceDescription.h
index ae17648..f10d996 100644 (file)
--- a/xbmc/interfaces/json-rpc/ServiceDescription.h
+++ b/xbmc/interfaces/json-rpc/ServiceDescription.h
@@ -943,6 +943,7 @@ namespace JSONRPC
             "\"AudioLibrary\": { \"$ref\": \"Optional.Boolean\" },"
             "\"VideoLibrary\": { \"$ref\": \"Optional.Boolean\" },"
             "\"Application\": { \"$ref\": \"Optional.Boolean\" },"
+            "\"Input\": { \"$ref\": \"Optional.Boolean\" },"
             "\"Other\": { \"$ref\": \"Optional.Boolean\" }"
           "}"
         "}"

diff --git a/xbmc/interfaces/json-rpc/types.json b/xbmc/interfaces/json-rpc/types.json
index 7eb3455..58c29ce 100644 (file)
--- a/xbmc/interfaces/json-rpc/types.json
+++ b/xbmc/interfaces/json-rpc/types.json
@@ -51,6 +51,8 @@
       "System": { "type": "boolean", "required": true },
       "VideoLibrary": { "type": "boolean", "required": true },
       "AudioLibrary": { "type": "boolean", "required": true },
+      "Application": { "type": "boolean", "required": true },
+      "Input": { "type": "boolean", "required": true },
       "Other": { "type": "boolean", "required": true }
     },
     "additionalProperties": false
@@ -833,4 +835,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}