aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Sommerfeld <kai.sommerfeld@gmx.com>2016-07-28 11:47:43 +0200
committerKai Sommerfeld <kai.sommerfeld@gmx.com>2016-08-02 10:09:22 +0200
commit7fb787450e5f579b9a5ad1694dae4c4d3d6811f5 (patch)
tree9455909b4ce809af9ae5699ba1663378fbaac72f
parent8cd7744eab3974184a2e866c0078dc92ef05a09e (diff)
[PVR][json-rpc] Added field PVR.Fields.Channel.isrecording
-rw-r--r--xbmc/interfaces/json-rpc/schema/types.json5
-rw-r--r--xbmc/interfaces/json-rpc/schema/version.txt2
-rw-r--r--xbmc/pvr/channels/PVRChannel.cpp2
3 files changed, 6 insertions, 3 deletions
diff --git a/xbmc/interfaces/json-rpc/schema/types.json b/xbmc/interfaces/json-rpc/schema/types.json
index 8472163ef6..2d60b37ecf 100644
--- a/xbmc/interfaces/json-rpc/schema/types.json
+++ b/xbmc/interfaces/json-rpc/schema/types.json
@@ -966,7 +966,7 @@
"items": { "type": "string",
"enum": [ "thumbnail", "channeltype", "hidden", "locked", "channel", "lastplayed",
"broadcastnow", "broadcastnext", "uniqueid", "icon", "channelnumber",
- "subchannelnumber" ]
+ "subchannelnumber", "isrecording" ]
}
},
"PVR.Details.Channel": {
@@ -984,7 +984,8 @@
"uniqueid": { "type": "integer", "required": true },
"icon": { "type": "string" },
"channelnumber": { "type": "integer" },
- "subchannelnumber": { "type": "integer" }
+ "subchannelnumber": { "type": "integer" },
+ "isrecording": { "type": "boolean" }
}
},
"PVR.Details.ChannelGroup": {
diff --git a/xbmc/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt
index c650e0fce4..3cfdb18dfc 100644
--- a/xbmc/interfaces/json-rpc/schema/version.txt
+++ b/xbmc/interfaces/json-rpc/schema/version.txt
@@ -1 +1 @@
-7.20.1
+7.21.0 \ No newline at end of file
diff --git a/xbmc/pvr/channels/PVRChannel.cpp b/xbmc/pvr/channels/PVRChannel.cpp
index 136b02ea83..d97e9bb713 100644
--- a/xbmc/pvr/channels/PVRChannel.cpp
+++ b/xbmc/pvr/channels/PVRChannel.cpp
@@ -135,6 +135,8 @@ void CPVRChannel::Serialize(CVariant& value) const
epg = GetEPGNext();
if (epg)
epg->Serialize(value["broadcastnext"]);
+
+ value["isrecording"] = IsRecording();
}
/********** XBMC related channel methods **********/