Skip to content
This repository
Browse code

Merge pull request #4135 from Montellese/jsonrpc_pvr_fixup

jsonrpc: fix mixup of "rating" and "parentalrating" for PVR broadcasts
  • Loading branch information...
commit 65ad3ae9092c84fc608dd9905a4e222138b4b943 2 parents b937a2e + dd49e69
jmarshallnz jmarshallnz authored
2  addons/xbmc.json/addon.xml
... ... @@ -1,5 +1,5 @@
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<addon id="xbmc.json" version="6.13.4" provider-name="Team XBMC">
  2 +<addon id="xbmc.json" version="6.13.5" provider-name="Team XBMC">
3 3 <backwards-compatibility abi="6.0.0"/>
4 4 <requires>
5 5 <import addon="xbmc.core" version="0.1.0"/>
1  xbmc/epg/EpgInfoTag.cpp
@@ -204,6 +204,7 @@ CEpgInfoTag &CEpgInfoTag::operator =(const CEpgInfoTag &other)
204 204 void CEpgInfoTag::Serialize(CVariant &value) const
205 205 {
206 206 value["broadcastid"] = m_iUniqueBroadcastID;
  207 + value["parentalrating"] = m_iParentalRating;
207 208 value["rating"] = m_iStarRating;
208 209 value["title"] = m_strTitle;
209 210 value["plotoutline"] = m_strPlotOutline;
9 xbmc/interfaces/json-rpc/ServiceDescription.h
@@ -22,7 +22,7 @@
22 22 namespace JSONRPC
23 23 {
24 24 const char* const JSONRPC_SERVICE_ID = "http://xbmc.org/jsonrpc/ServiceDescription.json";
25   - const char* const JSONRPC_SERVICE_VERSION = "6.13.4";
  25 + const char* const JSONRPC_SERVICE_VERSION = "6.13.5";
26 26 const char* const JSONRPC_SERVICE_DESCRIPTION = "JSON-RPC API of XBMC";
27 27
28 28 const char* const JSONRPC_SERVICE_TYPES[] = {
@@ -826,7 +826,7 @@ namespace JSONRPC
826 826 "\"endtime\", \"runtime\", \"progress\", \"progresspercentage\","
827 827 "\"genre\", \"episodename\", \"episodenum\", \"episodepart\","
828 828 "\"firstaired\", \"hastimer\", \"isactive\", \"parentalrating\","
829   - "\"wasactive\", \"thumbnail\" ]"
  829 + "\"wasactive\", \"thumbnail\", \"rating\" ]"
830 830 "}"
831 831 "}",
832 832 "\"PVR.Details.Broadcast\": {"
@@ -848,9 +848,10 @@ namespace JSONRPC
848 848 "\"firstaired\": { \"type\": \"string\" },"
849 849 "\"hastimer\": { \"type\": \"boolean\" },"
850 850 "\"isactive\": { \"type\": \"boolean\" },"
851   - "\"rating\": { \"type\": \"integer\" },"
  851 + "\"parentalrating\": { \"type\": \"integer\" },"
852 852 "\"wasactive\": { \"type\": \"boolean\" },"
853   - "\"thumbnail\": { \"type\": \"string\" }"
  853 + "\"thumbnail\": { \"type\": \"string\" },"
  854 + "\"rating\": { \"type\": \"integer\" }"
854 855 "}"
855 856 "}",
856 857 "\"Textures.Details.Size\": {"
7 xbmc/interfaces/json-rpc/types.json
@@ -799,7 +799,7 @@
799 799 "endtime", "runtime", "progress", "progresspercentage",
800 800 "genre", "episodename", "episodenum", "episodepart",
801 801 "firstaired", "hastimer", "isactive", "parentalrating",
802   - "wasactive", "thumbnail" ]
  802 + "wasactive", "thumbnail", "rating" ]
803 803 }
804 804 },
805 805 "PVR.Details.Broadcast": {
@@ -821,9 +821,10 @@
821 821 "firstaired": { "type": "string" },
822 822 "hastimer": { "type": "boolean" },
823 823 "isactive": { "type": "boolean" },
824   - "rating": { "type": "integer" },
  824 + "parentalrating": { "type": "integer" },
825 825 "wasactive": { "type": "boolean" },
826   - "thumbnail": { "type": "string" }
  826 + "thumbnail": { "type": "string" },
  827 + "rating": { "type": "integer" }
827 828 }
828 829 },
829 830 "Textures.Details.Size": {

0 comments on commit 65ad3ae

Please sign in to comment.
Something went wrong with that request. Please try again.