From 504e2099e2f11203c48dff94a67ec797a454d459 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 6 Feb 2015 22:25:23 -0500
Subject: update dlna profiles

---
 MediaBrowser.Model/Dlna/AudioOptions.cs  | 11 +++++++++++
 MediaBrowser.Model/Dlna/DeviceProfile.cs |  2 --
 MediaBrowser.Model/Dlna/StreamBuilder.cs |  9 +++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'MediaBrowser.Model/Dlna')

diff --git a/MediaBrowser.Model/Dlna/AudioOptions.cs b/MediaBrowser.Model/Dlna/AudioOptions.cs
index dd6dad2610..cddfd89559 100644
--- a/MediaBrowser.Model/Dlna/AudioOptions.cs
+++ b/MediaBrowser.Model/Dlna/AudioOptions.cs
@@ -47,6 +47,17 @@ namespace MediaBrowser.Model.Dlna
         /// <value>The audio transcoding bitrate.</value>
         public int? AudioTranscodingBitrate { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether [supports direct remote content].
+        /// </summary>
+        /// <value><c>true</c> if [supports direct remote content]; otherwise, <c>false</c>.</value>
+        public bool SupportsDirectRemoteContent { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether [supports custom HTTP headers].
+        /// </summary>
+        /// <value><c>true</c> if [supports custom HTTP headers]; otherwise, <c>false</c>.</value>
+        public bool SupportsCustomHttpHeaders { get; set; }
+        
         /// <summary>
         /// Gets the maximum bitrate.
         /// </summary>
diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs
index 3bbef28c57..4b137a268c 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs
@@ -76,8 +76,6 @@ namespace MediaBrowser.Model.Dlna
         public bool RequiresPlainVideoItems { get; set; }
         public bool RequiresPlainFolders { get; set; }
 
-        public bool SupportsDirectRemoteContent { get; set; }
-        public bool SupportsCustomHttpHeaders { get; set; }
         public bool EnableMSMediaReceiverRegistrar { get; set; }
 
         public XmlAttribute[] XmlRootAttributes { get; set; }
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 8b929425a1..6076637b44 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -258,7 +258,7 @@ namespace MediaBrowser.Model.Dlna
             if (IsEligibleForDirectPlay(item, maxBitrateSetting, subtitleStream, options))
             {
                 // See if it can be direct played
-                var directPlay = GetVideoDirectPlayProfile(options.Profile, item, videoStream, audioStream);
+                var directPlay = GetVideoDirectPlayProfile(options, options.Profile, item, videoStream, audioStream);
 
                 if (directPlay != null)
                 {
@@ -380,7 +380,8 @@ namespace MediaBrowser.Model.Dlna
             return 128000;
         }
 
-        private PlayMethod? GetVideoDirectPlayProfile(DeviceProfile profile,
+        private PlayMethod? GetVideoDirectPlayProfile(VideoOptions options,
+            DeviceProfile profile,
             MediaSourceInfo mediaSource,
             MediaStream videoStream,
             MediaStream audioStream)
@@ -504,12 +505,12 @@ namespace MediaBrowser.Model.Dlna
 
             if (mediaSource.Protocol == MediaProtocol.Http)
             {
-                if (!profile.SupportsDirectRemoteContent)
+                if (!options.SupportsDirectRemoteContent)
                 {
                     return null;
                 }
 
-                if (mediaSource.RequiredHttpHeaders.Count > 0 && !profile.SupportsCustomHttpHeaders)
+                if (mediaSource.RequiredHttpHeaders.Count > 0 && !options.SupportsCustomHttpHeaders)
                 {
                     return null;
                 }
-- 
cgit v1.2.3