Merge pull request xbmc#23972 from ksooo/fix-jsonrpc-pvr-playback-2

[interfaces] Fix PVR channel playback from remote app 'favourites'
ksooo · Oct 22, 2023 · d92683f · d92683f
2 parents b5d8762 + 2614b6b
commit d92683f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/xbmc/PlayListPlayer.cpp b/xbmc/PlayListPlayer.cpp
@@ -958,7 +958,7 @@ void PLAYLIST::CPlayListPlayer::OnApplicationMessage(KODI::MESSAGING::ThreadMess
           {
             return;
           }
-          if (!item->IsPVR() && (item->IsAudio() || item->IsVideo()))
+          if (item->IsAudio() || item->IsVideo())
             Play(item, pMsg->strParam);
           else
             g_application.PlayMedia(*item, pMsg->strParam, playlistId);

diff --git a/xbmc/interfaces/json-rpc/PlayerOperations.cpp b/xbmc/interfaces/json-rpc/PlayerOperations.cpp
@@ -47,6 +47,7 @@
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
 #include "utils/MathUtils.h"
+#include "utils/URIUtils.h"
 #include "utils/Variant.h"
 #include "video/VideoDatabase.h"
 
@@ -897,6 +898,12 @@ JSONRPC_STATUS CPlayerOperations::Open(const std::string &method, ITransportLaye
 
         return StartSlideshow("", false, optionShuffled.isBoolean() && optionShuffled.asBoolean());
       }
+      else if (list.Size() == 1 && (URIUtils::IsPVRChannel(list[0]->GetPath()) ||
+                                    URIUtils::IsPVRRecording(list[0]->GetPath())))
+      {
+        if (!CServiceBroker::GetPVRManager().Get<PVR::GUI::Playback>().PlayMedia(*list[0]))
+          return FailedToExecute;
+      }
       else
       {
         std::string playername;

diff --git a/xbmc/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt
@@ -1 +1 @@
-JSONRPC_VERSION 13.3.0
+JSONRPC_VERSION 13.3.1