From 4afe2c3f731562efbe42147d1bcbdc0a7542cfeb Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 1 Apr 2014 00:16:25 -0400
Subject: updated dlna profile format

---
 MediaBrowser.Controller/Dlna/DeviceProfile.cs      | 16 +++----
 MediaBrowser.Controller/Dlna/MediaProfile.cs       | 49 ----------------------
 MediaBrowser.Controller/Dlna/ResponseProfile.cs    | 49 ++++++++++++++++++++++
 MediaBrowser.Controller/Dlna/TranscodingProfile.cs | 23 +---------
 .../MediaBrowser.Controller.csproj                 |  2 +-
 5 files changed, 60 insertions(+), 79 deletions(-)
 delete mode 100644 MediaBrowser.Controller/Dlna/MediaProfile.cs
 create mode 100644 MediaBrowser.Controller/Dlna/ResponseProfile.cs

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Dlna/DeviceProfile.cs b/MediaBrowser.Controller/Dlna/DeviceProfile.cs
index c1fc713e4..bb9629c28 100644
--- a/MediaBrowser.Controller/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Controller/Dlna/DeviceProfile.cs
@@ -74,13 +74,13 @@ namespace MediaBrowser.Controller.Dlna
         public ContainerProfile[] ContainerProfiles { get; set; }
 
         public CodecProfile[] CodecProfiles { get; set; }
-        public MediaProfile[] MediaProfiles { get; set; }
+        public ResponseProfile[] ResponseProfiles { get; set; }
 
         public DeviceProfile()
         {
             DirectPlayProfiles = new DirectPlayProfile[] { };
             TranscodingProfiles = new TranscodingProfile[] { };
-            MediaProfiles = new MediaProfile[] { };
+            ResponseProfiles = new ResponseProfile[] { };
             CodecProfiles = new CodecProfile[] { };
             ContainerProfiles = new ContainerProfile[] { };
 
@@ -147,11 +147,11 @@ namespace MediaBrowser.Controller.Dlna
             });
         }
 
-        public MediaProfile GetAudioMediaProfile(string container, string audioCodec, MediaStream audioStream)
+        public ResponseProfile GetAudioMediaProfile(string container, string audioCodec, MediaStream audioStream)
         {
             container = (container ?? string.Empty).TrimStart('.');
 
-            return MediaProfiles.FirstOrDefault(i =>
+            return ResponseProfiles.FirstOrDefault(i =>
             {
                 if (i.Type != DlnaProfileType.Audio)
                 {
@@ -174,11 +174,11 @@ namespace MediaBrowser.Controller.Dlna
             });
         }
 
-        public MediaProfile GetVideoMediaProfile(string container, string audioCodec, string videoCodec, MediaStream audioStream, MediaStream videoStream)
+        public ResponseProfile GetVideoMediaProfile(string container, string audioCodec, string videoCodec, MediaStream audioStream, MediaStream videoStream)
         {
             container = (container ?? string.Empty).TrimStart('.');
 
-            return MediaProfiles.FirstOrDefault(i =>
+            return ResponseProfiles.FirstOrDefault(i =>
             {
                 if (i.Type != DlnaProfileType.Video)
                 {
@@ -207,11 +207,11 @@ namespace MediaBrowser.Controller.Dlna
             });
         }
 
-        public MediaProfile GetPhotoMediaProfile(string container)
+        public ResponseProfile GetPhotoMediaProfile(string container)
         {
             container = (container ?? string.Empty).TrimStart('.');
 
-            return MediaProfiles.FirstOrDefault(i =>
+            return ResponseProfiles.FirstOrDefault(i =>
             {
                 if (i.Type != DlnaProfileType.Photo)
                 {
diff --git a/MediaBrowser.Controller/Dlna/MediaProfile.cs b/MediaBrowser.Controller/Dlna/MediaProfile.cs
deleted file mode 100644
index bf3057294..000000000
--- a/MediaBrowser.Controller/Dlna/MediaProfile.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Serialization;
-
-namespace MediaBrowser.Controller.Dlna
-{
-    public class MediaProfile
-    {
-        [XmlAttribute("container")]
-        public string Container { get; set; }
-
-        [XmlAttribute("audioCodec")]
-        public string AudioCodec { get; set; }
-
-        [XmlAttribute("videoCodec")]
-        public string VideoCodec { get; set; }
-
-        [XmlAttribute("type")]
-        public DlnaProfileType Type { get; set; }
-
-        [XmlAttribute("orgPn")]
-        public string OrgPn { get; set; }
-
-        [XmlAttribute("mimeType")]
-        public string MimeType { get; set; }
-
-        public ProfileCondition[] Conditions { get; set; }
-
-        public MediaProfile()
-        {
-            Conditions = new ProfileCondition[] {};
-        }
-
-        public List<string> GetContainers()
-        {
-            return (Container ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
-        }
-        
-        public List<string> GetAudioCodecs()
-        {
-            return (AudioCodec ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
-        }
-
-        public List<string> GetVideoCodecs()
-        {
-            return (VideoCodec ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/Dlna/ResponseProfile.cs b/MediaBrowser.Controller/Dlna/ResponseProfile.cs
new file mode 100644
index 000000000..163a95d5a
--- /dev/null
+++ b/MediaBrowser.Controller/Dlna/ResponseProfile.cs
@@ -0,0 +1,49 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Serialization;
+
+namespace MediaBrowser.Controller.Dlna
+{
+    public class ResponseProfile
+    {
+        [XmlAttribute("container")]
+        public string Container { get; set; }
+
+        [XmlAttribute("audioCodec")]
+        public string AudioCodec { get; set; }
+
+        [XmlAttribute("videoCodec")]
+        public string VideoCodec { get; set; }
+
+        [XmlAttribute("type")]
+        public DlnaProfileType Type { get; set; }
+
+        [XmlAttribute("orgPn")]
+        public string OrgPn { get; set; }
+
+        [XmlAttribute("mimeType")]
+        public string MimeType { get; set; }
+
+        public ProfileCondition[] Conditions { get; set; }
+
+        public ResponseProfile()
+        {
+            Conditions = new ProfileCondition[] {};
+        }
+
+        public List<string> GetContainers()
+        {
+            return (Container ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
+        }
+        
+        public List<string> GetAudioCodecs()
+        {
+            return (AudioCodec ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
+        }
+
+        public List<string> GetVideoCodecs()
+        {
+            return (VideoCodec ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/Dlna/TranscodingProfile.cs b/MediaBrowser.Controller/Dlna/TranscodingProfile.cs
index 707f0c573..704ba54d2 100644
--- a/MediaBrowser.Controller/Dlna/TranscodingProfile.cs
+++ b/MediaBrowser.Controller/Dlna/TranscodingProfile.cs
@@ -30,13 +30,8 @@ namespace MediaBrowser.Controller.Dlna
         [XmlAttribute("transcodeSeekInfo")]
         public TranscodeSeekInfo TranscodeSeekInfo { get; set; }
 
-        public TranscodingSetting[] Settings { get; set; }
-
-        public TranscodingProfile()
-        {
-            Settings = new TranscodingSetting[] { };
-        }
-
+        [XmlAttribute("videoProfile")]
+        public string VideoProfile { get; set; }
 
         public List<string> GetAudioCodecs()
         {
@@ -44,20 +39,6 @@ namespace MediaBrowser.Controller.Dlna
         }
     }
 
-    public class TranscodingSetting
-    {
-        [XmlAttribute("name")]
-        public TranscodingSettingType Name { get; set; }
-
-        [XmlAttribute("value")]
-        public string Value { get; set; }
-    }
-
-    public enum TranscodingSettingType
-    {
-        VideoProfile = 0
-    }
-
     public enum TranscodeSeekInfo
     {
         Auto = 0,
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 16834a945..a233c1f12 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -84,7 +84,7 @@
     <Compile Include="Dlna\DirectPlayProfile.cs" />
     <Compile Include="Dlna\IDlnaManager.cs" />
     <Compile Include="Dlna\DeviceProfile.cs" />
-    <Compile Include="Dlna\MediaProfile.cs" />
+    <Compile Include="Dlna\ResponseProfile.cs" />
     <Compile Include="Dlna\TranscodingProfile.cs" />
     <Compile Include="Drawing\IImageProcessor.cs" />
     <Compile Include="Drawing\ImageFormat.cs" />
-- 
cgit v1.2.3