diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2014-11-29 11:32:19 +0100 |
|---|---|---|
| committer | Martijn Kaijser <machine.sanctum@gmail.com> | 2014-11-29 11:32:19 +0100 |
| commit | 73b8a0fc22a29460eb77cb677487684695347b74 (patch) | |
| tree | 27f8f5d396acef742a097537e9f2de5939aadd5e | |
| parent | 7cf5a140395931c21aea9743d988149dcd8397f1 (diff) | |
| parent | 563e647875c4df45b60c5537b39954b0f9e16779 (diff) | |
Merge pull request #5843 from Montellese/pvr_fix_epg_serialization
jsonrpc: fix Player.GetItem for PVR channels not providing extended details like plot, genre etc.
| -rw-r--r-- | xbmc/interfaces/json-rpc/schema/version.txt | 2 | ||||
| -rw-r--r-- | xbmc/pvr/channels/PVRChannel.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/xbmc/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt index 7ecad14053..476d3ceb74 100644 --- a/xbmc/interfaces/json-rpc/schema/version.txt +++ b/xbmc/interfaces/json-rpc/schema/version.txt @@ -1 +1 @@ -6.21.0 +6.21.1 diff --git a/xbmc/pvr/channels/PVRChannel.cpp b/xbmc/pvr/channels/PVRChannel.cpp index 43ec0611d5..3416304c91 100644 --- a/xbmc/pvr/channels/PVRChannel.cpp +++ b/xbmc/pvr/channels/PVRChannel.cpp @@ -163,7 +163,12 @@ void CPVRChannel::Serialize(CVariant& value) const CEpgInfoTag epg; if (GetEPGNow(epg)) + { + // add the properties of the current EPG item to the main object + epg.Serialize(value); + // and add an extra sub-object with only the current EPG details epg.Serialize(value["broadcastnow"]); + } if (GetEPGNext(epg)) epg.Serialize(value["broadcastnext"]); |