added new device profiles

5 files changed, 31 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Dlna/AudioOptions.cs b/MediaBrowser.Model/Dlna/AudioOptions.cs
index d04133a3d9..6e630ee55a 100644
--- a/MediaBrowser.Model/Dlna/AudioOptions.cs
+++ b/MediaBrowser.Model/Dlna/AudioOptions.cs
@@ -29,5 +29,11 @@ namespace MediaBrowser.Model.Dlna
         /// The application's configured quality setting
         /// </summary>
         public int? MaxBitrate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the context.
+        /// </summary>
+        /// <value>The context.</value>
+        public EncodingContext Context { get; set; }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs
index deaa307146..4040b57f95 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs
@@ -89,6 +89,9 @@ namespace MediaBrowser.Model.Dlna
         public CodecProfile[] CodecProfiles { get; set; }
         public ResponseProfile[] ResponseProfiles { get; set; }
 
+        public SubtitleProfile[] SoftSubtitleProfiles { get; set; }
+        public SubtitleProfile[] ExternalSubtitleProfiles { get; set; }
+      
         public DeviceProfile()
         {
             DirectPlayProfiles = new DirectPlayProfile[] { };
@@ -97,6 +100,9 @@ namespace MediaBrowser.Model.Dlna
             CodecProfiles = new CodecProfile[] { };
             ContainerProfiles = new ContainerProfile[] { };
 
+            SoftSubtitleProfiles = new SubtitleProfile[] { };
+            ExternalSubtitleProfiles = new SubtitleProfile[] { };
+            
             XmlRootAttributes = new XmlAttribute[] { };
             
             SupportedMediaTypes = "Audio,Photo,Video";
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 8aadd428f6..a35b34d52e 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -171,7 +171,7 @@ namespace MediaBrowser.Model.Dlna
             TranscodingProfile transcodingProfile = null;
             foreach (TranscodingProfile i in options.Profile.TranscodingProfiles)
             {
-                if (i.Type == playlistItem.MediaType)
+                if (i.Type == playlistItem.MediaType && i.Context == options.Context)
                 {
                     transcodingProfile = i;
                     break;
@@ -262,7 +262,7 @@ namespace MediaBrowser.Model.Dlna
             TranscodingProfile transcodingProfile = null;
             foreach (TranscodingProfile i in options.Profile.TranscodingProfiles)
             {
-                if (i.Type == playlistItem.MediaType)
+                if (i.Type == playlistItem.MediaType && i.Context == options.Context)
                 {
                     transcodingProfile = i;
                     break;
diff --git a/MediaBrowser.Model/Dlna/SubtitleProfile.cs b/MediaBrowser.Model/Dlna/SubtitleProfile.cs
new file mode 100644
index 0000000000..ec38d96aeb
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/SubtitleProfile.cs
@@ -0,0 +1,8 @@
+
+namespace MediaBrowser.Model.Dlna
+{
+    public class SubtitleProfile
+    {
+        public string Format { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Dlna/TranscodingProfile.cs b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
index 51f4bfe619..976f8e8d1f 100644
--- a/MediaBrowser.Model/Dlna/TranscodingProfile.cs
+++ b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
@@ -32,6 +32,9 @@ namespace MediaBrowser.Model.Dlna
         [XmlAttribute("videoProfile")]
         public string VideoProfile { get; set; }
 
+        [XmlAttribute("context")]
+        public EncodingContext Context { get; set; }
+
         public List<string> GetAudioCodecs()
         {
             List<string> list = new List<string>();
@@ -42,4 +45,10 @@ namespace MediaBrowser.Model.Dlna
             return list;
         }
     }
+
+    public enum EncodingContext
+    {
+        Streaming = 0,
+        Static = 1
+    }
 }