aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-02-05 10:31:11 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-02-05 10:31:11 -0500
commit4ba4072e63022436899ef941c0b7d48f6a4198fc (patch)
tree7833d1a38a9ac6d3c3db49e243c87129a6ad9da0
parentbd5bad4f8863e1c409e0efcba7fedeca43f9190b (diff)
add credentials to media elements
-rw-r--r--MediaBrowser.Model/Dto/MediaSourceInfo.cs3
-rw-r--r--MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs6
2 files changed, 9 insertions, 0 deletions
diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
index 8897edcbd..c794db249 100644
--- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -52,6 +52,8 @@ namespace MediaBrowser.Model.Dto
public string TranscodingSubProtocol { get; set; }
public string TranscodingContainer { get; set; }
+ public bool EnableHttpCredentials { get; set; }
+
public MediaSourceInfo()
{
Formats = new List<string>();
@@ -61,6 +63,7 @@ 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 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;
}