From ade0eb6ded058dbdd10b1b5bcf8dfd94fb4e913f Mon Sep 17 00:00:00 2001
From: Martin Vallevand <mvallevand@gmail.com>
Date: Fri, 5 Jul 2024 17:10:01 -0400
Subject: JSONRPC Changes for PVR Series/Episodes

Expose  episodename and episodepart to List.Item.All   In PVR.Fields.Broadcast duplicate seasonnum as season and episodenum as episode making them available to List.Item.All calls.  Flag seasonnum and episodenum as deprecated for future removeall
---
 xbmc/interfaces/json-rpc/schema/types.json  | 16 ++++++++++++++--
 xbmc/interfaces/json-rpc/schema/version.txt |  2 +-
 xbmc/pvr/epg/EpgInfoTag.cpp                 |  2 ++
 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();
-- 
cgit v1.2.3