瀏覽代碼

update hls authentication

Luke Pulverenti 8 年之前
父節點
當前提交
28e6f8cbd8

+ 0 - 3
MediaBrowser.Api/Playback/Hls/BaseHlsService.cs

@@ -13,10 +13,7 @@ using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.IO;
 
 namespace MediaBrowser.Api.Playback.Hls
 {

+ 1 - 0
MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs

@@ -89,6 +89,7 @@ namespace MediaBrowser.Api.Playback.Hls
         public string SegmentId { get; set; }
     }
 
+    [Authenticated]
     public class DynamicHlsService : BaseHlsService
     {
 

+ 1 - 0
MediaBrowser.Api/Playback/Hls/HlsSegmentService.cs

@@ -76,6 +76,7 @@ namespace MediaBrowser.Api.Playback.Hls
         public string SegmentId { get; set; }
     }
 
+    [Authenticated]
     public class HlsSegmentService : BaseApiService
     {
         private readonly IServerApplicationPaths _appPaths;

+ 1 - 0
MediaBrowser.Api/Playback/Hls/VideoHlsService.cs

@@ -20,6 +20,7 @@ namespace MediaBrowser.Api.Playback.Hls
     /// <summary>
     /// Class VideoHlsService
     /// </summary>
+    [Authenticated]
     public class VideoHlsService : BaseHlsService
     {
         public object Get(GetLiveHlsStream request)

+ 2 - 0
MediaBrowser.Api/Playback/Progressive/VideoService.cs

@@ -62,6 +62,8 @@ namespace MediaBrowser.Api.Playback.Progressive
     /// <summary>
     /// Class VideoService
     /// </summary>
+    // TODO: In order to autheneticate this in the future, Dlna playback will require updating
+    //[Authenticated]
     public class VideoService : BaseProgressiveStreamingService
     {
         public VideoService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer, IAuthorizationContext authorizationContext, IImageProcessor imageProcessor) : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer, authorizationContext, imageProcessor)

+ 1 - 1
MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs

@@ -58,7 +58,7 @@ namespace MediaBrowser.Api.Session
 
         void _sessionManager_PlaybackProgress(object sender, PlaybackProgressEventArgs e)
         {
-            SendData(false);
+            SendData(!e.IsAutomated);
         }
 
         void _sessionManager_PlaybackStopped(object sender, PlaybackStopEventArgs e)