Merge pull request #14015 from ksooo/pvr-inputstream-rework

[PVR][VideoPlayer] Rework and simplify DVDInputStreamPVRManager.
xbmc · Jun 12, 2018 · e71f05c · e71f05c
2 parents 8e7b085 + 0cd0642
commit e71f05c
Show file tree

Hide file tree

Showing 18 changed files with 831 additions and 975 deletions.
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDFactoryDemuxer.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDFactoryDemuxer.cpp
@@ -21,19 +21,15 @@
 #include "DVDFactoryDemuxer.h"
 
 #include "DVDInputStreams/DVDInputStream.h"
-#include "DVDInputStreams/DVDInputStreamPVRManager.h"
 
 #include "DVDDemuxFFmpeg.h"
 #include "DVDDemuxBXA.h"
 #include "DVDDemuxCDDA.h"
 #include "DVDDemuxClient.h"
 #include "DemuxMultiSource.h"
-#include "pvr/PVRManager.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
 
-using namespace PVR;
-
 CDVDDemux* CDVDFactoryDemuxer::CreateDemuxer(std::shared_ptr<CDVDInputStream> pInputStream, bool fileinfo)
 {
   if (!pInputStream)

diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/CMakeLists.txt b/xbmc/cores/VideoPlayer/DVDInputStreams/CMakeLists.txt
@@ -4,25 +4,29 @@ set(SOURCES DVDFactoryInputStream.cpp
             DVDInputStreamFile.cpp
             DVDInputStreamMemory.cpp
             DVDInputStreamNavigator.cpp
-            DVDInputStreamPVRManager.cpp
             DVDInputStreamStack.cpp
             DVDStateSerializer.cpp
             InputStreamAddon.cpp
-            InputStreamMultiSource.cpp)
+            InputStreamMultiSource.cpp
+            InputStreamPVRBase.cpp
+            InputStreamPVRChannel.cpp
+            InputStreamPVRRecording.cpp)
 
 set(HEADERS DVDFactoryInputStream.h
             DVDInputStream.h
             DVDInputStreamFFmpeg.h
             DVDInputStreamFile.h
             DVDInputStreamMemory.h
             DVDInputStreamNavigator.h
-            DVDInputStreamPVRManager.h
             DVDInputStreamStack.h
             DVDStateSerializer.h
             DllDvdNav.h
             InputStreamAddon.h
             InputStreamMultiStreams.h
-            InputStreamMultiSource.h)
+            InputStreamMultiSource.h
+            InputStreamPVRBase.h
+            InputStreamPVRChannel.h
+            InputStreamPVRRecording.h)
 
 if(BLURAY_FOUND)
   list(APPEND SOURCES DVDInputStreamBluray.cpp)

diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDFactoryInputStream.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDFactoryInputStream.cpp
@@ -23,9 +23,10 @@
 #include "DVDInputStreamFile.h"
 #include "DVDInputStreamNavigator.h"
 #include "DVDInputStreamFFmpeg.h"
-#include "DVDInputStreamPVRManager.h"
 #include "InputStreamAddon.h"
 #include "InputStreamMultiSource.h"
+#include "InputStreamPVRChannel.h"
+#include "InputStreamPVRRecording.h"
 #ifdef HAVE_LIBBLURAY
 #include "DVDInputStreamBluray.h"
 #endif
@@ -96,8 +97,10 @@ std::shared_ptr<CDVDInputStream> CDVDFactoryInputStream::CreateInputStream(IVide
 
   if (fileitem.IsDVDFile(false, true))
     return std::shared_ptr<CDVDInputStreamNavigator>(new CDVDInputStreamNavigator(pPlayer, fileitem));
-  else if(file.substr(0, 6) == "pvr://")
-    return std::shared_ptr<CDVDInputStreamPVRManager>(new CDVDInputStreamPVRManager(pPlayer, fileitem));
+  else if (fileitem.IsPVRChannel() && file.substr(0, 6) == "pvr://")
+    return std::shared_ptr<CInputStreamPVRChannel>(new CInputStreamPVRChannel(pPlayer, fileitem));
+  else if (fileitem.IsUsablePVRRecording() && file.substr(0, 6) == "pvr://")
+    return std::shared_ptr<CInputStreamPVRRecording>(new CInputStreamPVRRecording(pPlayer, fileitem));
 #ifdef HAVE_LIBBLURAY
   else if (fileitem.IsType(".bdmv") || fileitem.IsType(".mpls") || file.substr(0, 7) == "bluray:")
     return std::shared_ptr<CDVDInputStreamBluray>(new CDVDInputStreamBluray(pPlayer, fileitem));