From 4ba4072e63022436899ef941c0b7d48f6a4198fc Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 5 Feb 2016 10:31:11 -0500 Subject: add credentials to media elements --- .../Sync/SyncedMediaSourceProvider.cs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs') diff --git a/MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs b/MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs index efd37fa00..d45db6c7e 100644 --- a/MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs +++ b/MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs @@ -11,6 +11,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; +using MediaBrowser.Model.MediaInfo; namespace MediaBrowser.Server.Implementations.Sync { @@ -137,6 +138,11 @@ namespace MediaBrowser.Server.Implementations.Sync mediaSource.Protocol = dynamicInfo.Protocol; mediaSource.RequiredHttpHeaders = dynamicInfo.RequiredHttpHeaders; + if (mediaSource.Protocol == MediaProtocol.Http) + { + mediaSource.EnableHttpCredentials = false; + } + return mediaSource; } -- cgit v1.2.3 From b94dc9d31a64eaf74be8d98ae64de0d81a219e63 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 5 Feb 2016 11:04:04 -0500 Subject: revert origin change --- MediaBrowser.Model/Dto/MediaSourceInfo.cs | 3 --- .../Sync/SyncedMediaSourceProvider.cs | 5 ----- 2 files changed, 8 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs') diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs index c794db249..f09a8b3a7 100644 --- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs +++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs @@ -51,8 +51,6 @@ namespace MediaBrowser.Model.Dto public string TranscodingUrl { get; set; } public string TranscodingSubProtocol { get; set; } public string TranscodingContainer { get; set; } - - public bool EnableHttpCredentials { get; set; } public MediaSourceInfo() { @@ -63,7 +61,6 @@ namespace MediaBrowser.Model.Dto SupportsTranscoding = true; SupportsDirectStream = true; SupportsDirectPlay = true; - EnableHttpCredentials = true; } public int? DefaultAudioStreamIndex { get; set; } diff --git a/MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs b/MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs index d45db6c7e..456a1fcc1 100644 --- a/MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs +++ b/MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs @@ -138,11 +138,6 @@ namespace MediaBrowser.Server.Implementations.Sync mediaSource.Protocol = dynamicInfo.Protocol; mediaSource.RequiredHttpHeaders = dynamicInfo.RequiredHttpHeaders; - if (mediaSource.Protocol == MediaProtocol.Http) - { - mediaSource.EnableHttpCredentials = false; - } - return mediaSource; } -- cgit v1.2.3