From 1603d1928e888abeccc6a5fab2e1f13aa65eea6c Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Fri, 10 Sep 2021 09:29:14 +0200
Subject: Kill ProgressiveFileCopier and seek to end for ongoing livetv

---
 .../Library/IDirectStreamProvider.cs                 | 20 ++++++++++++++++++++
 MediaBrowser.Controller/Library/ILiveStream.cs       |  3 +++
 .../Library/IMediaSourceManager.cs                   | 15 +++++++--------
 3 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 MediaBrowser.Controller/Library/IDirectStreamProvider.cs

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Controller/Library/IDirectStreamProvider.cs b/MediaBrowser.Controller/Library/IDirectStreamProvider.cs
new file mode 100644
index 000000000..2939668f7
--- /dev/null
+++ b/MediaBrowser.Controller/Library/IDirectStreamProvider.cs
@@ -0,0 +1,20 @@
+using System.IO;
+
+namespace MediaBrowser.Controller.Library
+{
+    /// <summary>
+    /// The direct live TV stream provider.
+    /// </summary>
+    /// <remarks>
+    /// Deprecated.
+    /// </remarks>
+    public interface IDirectStreamProvider
+    {
+        /// <summary>
+        /// Gets the live stream, optionally seeks to the end of the file first.
+        /// </summary>
+        /// <param name="seekNearEnd">A value indicating whether to seek to the end of the file.</param>
+        /// <returns>The stream.</returns>
+        Stream GetStream(bool seekNearEnd = true);
+    }
+}
diff --git a/MediaBrowser.Controller/Library/ILiveStream.cs b/MediaBrowser.Controller/Library/ILiveStream.cs
index 323aa4876..a29a91fe9 100644
--- a/MediaBrowser.Controller/Library/ILiveStream.cs
+++ b/MediaBrowser.Controller/Library/ILiveStream.cs
@@ -2,6 +2,7 @@
 
 #pragma warning disable CA1711, CS1591
 
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Dto;
@@ -25,5 +26,7 @@ namespace MediaBrowser.Controller.Library
         Task Open(CancellationToken openCancellationToken);
 
         Task Close();
+
+        Stream GetStream(bool seekNearEnd = true);
     }
 }
diff --git a/MediaBrowser.Controller/Library/IMediaSourceManager.cs b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
index fd3631da9..0de3ccf3f 100644
--- a/MediaBrowser.Controller/Library/IMediaSourceManager.cs
+++ b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Data.Entities;
@@ -110,6 +109,13 @@ namespace MediaBrowser.Controller.Library
 
         Task<Tuple<MediaSourceInfo, IDirectStreamProvider>> GetLiveStreamWithDirectStreamProvider(string id, CancellationToken cancellationToken);
 
+        /// <summary>
+        /// Gets the live stream info.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>An instance of <see cref="ILiveStream"/>.</returns>
+        public ILiveStream GetLiveStreamInfo(string id);
+
         /// <summary>
         /// Closes the media source.
         /// </summary>
@@ -129,11 +135,4 @@ namespace MediaBrowser.Controller.Library
 
         Task<IDirectStreamProvider> GetDirectStreamProviderByUniqueId(string uniqueId, CancellationToken cancellationToken);
     }
-
-    public interface IDirectStreamProvider
-    {
-        Task CopyToAsync(Stream stream, CancellationToken cancellationToken);
-
-        string GetFilePath();
-    }
 }
-- 
cgit v1.2.3