Add codec, bitrate and channels to the "audiostreams" result of Player.GetProperties.

This makes Player.Audio.Stream and Player.Audio.Stream.Extended equal. Therefore Player.Audio.Stream.Extended is dropped.

diff --git a/xbmc/interfaces/json-rpc/PlayerOperations.cpp b/xbmc/interfaces/json-rpc/PlayerOperations.cpp
index c629d62..9bb7f72 100644 (file)
--- a/xbmc/interfaces/json-rpc/PlayerOperations.cpp
+++ b/xbmc/interfaces/json-rpc/PlayerOperations.cpp
@@ -1399,6 +1399,9 @@ JSONRPC_STATUS CPlayerOperations::GetPropertyValue(PlayerType player, const CStd
             audioStream["index"] = index;
             audioStream["name"] = info.name;
             audioStream["language"] = info.language;
+            audioStream["codec"] = info.audioCodecName;
+            audioStream["bitrate"] = info.bitrate;
+            audioStream["channels"] = info.channels;
 
             result.append(audioStream);
           }

diff --git a/xbmc/interfaces/json-rpc/ServiceDescription.h b/xbmc/interfaces/json-rpc/ServiceDescription.h
index a446a0d..704959c 100644 (file)
--- a/xbmc/interfaces/json-rpc/ServiceDescription.h
+++ b/xbmc/interfaces/json-rpc/ServiceDescription.h
@@ -225,12 +225,7 @@ namespace JSONRPC
       "\"properties\": {"
         "\"index\": { \"type\": \"integer\", \"minimum\": 0, \"required\": true },"
         "\"name\": { \"type\": \"string\", \"required\": true },"
-        "\"language\": { \"type\": \"string\", \"required\": true }"
-      "}"
-    "}",
-    "\"Player.Audio.Stream.Extended\": {"
-      "\"extends\": \"Player.Audio.Stream\","
-      "\"properties\": {"
+        "\"language\": { \"type\": \"string\", \"required\": true },"
         "\"codec\": { \"type\": \"string\", \"required\": true },"
         "\"bitrate\": { \"type\": \"integer\", \"required\": true },"
         "\"channels\": { \"type\": \"integer\", \"required\": true }"
@@ -272,7 +267,7 @@ namespace JSONRPC
         "\"canrotate\": { \"type\": \"boolean\" },"
         "\"canshuffle\": { \"type\": \"boolean\" },"
         "\"canrepeat\": { \"type\": \"boolean\" },"
-        "\"currentaudiostream\": { \"$ref\": \"Player.Audio.Stream.Extended\" },"
+        "\"currentaudiostream\": { \"$ref\": \"Player.Audio.Stream\" },"
         "\"audiostreams\": { \"type\": \"array\", \"items\": { \"$ref\": \"Player.Audio.Stream\" } },"
         "\"subtitleenabled\": { \"type\": \"boolean\" },"
         "\"currentsubtitle\": { \"$ref\": \"Player.Subtitle\" },"

diff --git a/xbmc/interfaces/json-rpc/types.json b/xbmc/interfaces/json-rpc/types.json
index db4f4c3..50ea1ad 100644 (file)
--- a/xbmc/interfaces/json-rpc/types.json
+++ b/xbmc/interfaces/json-rpc/types.json
@@ -198,12 +198,7 @@
     "properties": {
       "index": { "type": "integer", "minimum": 0, "required": true },
       "name": { "type": "string", "required": true },
-      "language": { "type": "string", "required": true }
-    }
-  },
-  "Player.Audio.Stream.Extended": {
-    "extends": "Player.Audio.Stream",
-    "properties": {
+      "language": { "type": "string", "required": true },
       "codec": { "type": "string", "required": true },
       "bitrate": { "type": "integer", "required": true },
       "channels": { "type": "integer", "required": true }
@@ -245,7 +240,7 @@
       "canrotate": { "type": "boolean" },
       "canshuffle": { "type": "boolean" },
       "canrepeat": { "type": "boolean" },
-      "currentaudiostream": { "$ref": "Player.Audio.Stream.Extended" },
+      "currentaudiostream": { "$ref": "Player.Audio.Stream" },
       "audiostreams": { "type": "array", "items": { "$ref": "Player.Audio.Stream" } },
       "subtitleenabled": { "type": "boolean" },
       "currentsubtitle": { "$ref": "Player.Subtitle" },