aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Sommerfeld <3226626+ksooo@users.noreply.github.com>2024-07-14 21:22:44 +0200
committerGitHub <noreply@github.com>2024-07-14 21:22:44 +0200
commit93a0e4e55d43dc7c4e5d2f11a0d11433df236cdc (patch)
treeb476badd48589afb334bacb28607399f59c5b9b6
parent060417ccfa5b21939669d404b9a223c3004ba132 (diff)
parentade0eb6ded058dbdd10b1b5bcf8dfd94fb4e913f (diff)
Merge pull request #25461 from emveepee/pvrjson
[PVR][JSONRPC] Standardize EpgTagInfo serialization names
-rw-r--r--xbmc/interfaces/json-rpc/schema/types.json16
-rw-r--r--xbmc/interfaces/json-rpc/schema/version.txt2
-rw-r--r--xbmc/pvr/epg/EpgInfoTag.cpp2
3 files changed, 17 insertions, 3 deletions
diff --git a/xbmc/interfaces/json-rpc/schema/types.json b/xbmc/interfaces/json-rpc/schema/types.json
index 4c67f7c35e..d0f38892db 100644
--- a/xbmc/interfaces/json-rpc/schema/types.json
+++ b/xbmc/interfaces/json-rpc/schema/types.json
@@ -2576,6 +2576,7 @@
"progress",
"progresspercentage",
"genre",
+ "episode",
"episodename",
"episodenum",
"episodepart",
@@ -2599,6 +2600,7 @@
"isplayable",
"clientid",
"hasreminder",
+ "season",
"seasonnum"
]
}
@@ -2640,9 +2642,13 @@
"episodename": {
"type": "string"
},
- "episodenum": {
+ "episode": {
"type": "integer"
},
+ "episodenum": {
+ "type": "integer",
+ "description": "Deprecated - Use episode"
+ },
"episodepart": {
"type": "integer"
},
@@ -2707,8 +2713,12 @@
"hasreminder": {
"type": "boolean"
},
- "seasonnum": {
+ "season": {
"type": "integer"
+ },
+ "seasonnum": {
+ "type": "integer",
+ "description": "Deprecated - Use season"
}
}
},
@@ -3881,6 +3891,8 @@
"firstaired",
"season",
"episode",
+ "episodepart",
+ "episodename",
"showtitle",
"thumbnail",
"file",
diff --git a/xbmc/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt
index 9f814eb2ec..4727db3092 100644
--- a/xbmc/interfaces/json-rpc/schema/version.txt
+++ b/xbmc/interfaces/json-rpc/schema/version.txt
@@ -1 +1 @@
-JSONRPC_VERSION 13.5.0
+JSONRPC_VERSION 13.6.0
diff --git a/xbmc/pvr/epg/EpgInfoTag.cpp b/xbmc/pvr/epg/EpgInfoTag.cpp
index a21894b64c..0b9cef0d01 100644
--- a/xbmc/pvr/epg/EpgInfoTag.cpp
+++ b/xbmc/pvr/epg/EpgInfoTag.cpp
@@ -188,8 +188,10 @@ void CPVREpgInfoTag::Serialize(CVariant& value) const
value["progress"] = Progress();
value["progresspercentage"] = ProgressPercentage();
value["episodename"] = m_strEpisodeName;
+ value["episode"] = m_iEpisodeNumber;
value["episodenum"] = m_iEpisodeNumber;
value["episodepart"] = m_iEpisodePart;
+ value["season"] = m_iSeriesNumber;
value["seasonnum"] = m_iSeriesNumber;
value["isactive"] = IsActive();
value["wasactive"] = WasActive();