updated dlna profiles

MediaBrowser.Dlna/Didl/DidlBuilder.cs

@@ -47,7 +47,7 @@ namespace MediaBrowser.Dlna.Didl
             didl.SetAttribute("xmlns:upnp", NS_UPNP);
             //didl.SetAttribute("xmlns:sec", NS_SEC);
 
-            foreach (var att in _profile.ContentDirectoryRootAttributes)
+            foreach (var att in _profile.XmlRootAttributes)
             {
                 didl.SetAttribute(att.Name, att.Value);
             }

MediaBrowser.Dlna/Profiles/Foobar2000Profile.cs

@@ -1,6 +1,5 @@
-using MediaBrowser.Controller.Dlna;
+using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
-using MediaBrowser.Model.Dlna;
 
 namespace MediaBrowser.Dlna.Profiles
 {

MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs

@@ -26,7 +26,7 @@ namespace MediaBrowser.Dlna.Profiles
                }
             };
 
-            ContentDirectoryRootAttributes = new[]
+            XmlRootAttributes = new[]
             {
                 new XmlAttribute
                 {

MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs

@@ -17,7 +17,7 @@ namespace MediaBrowser.Dlna.Profiles
                 ModelUrl = "samsung.com"
             };
 
-            ContentDirectoryRootAttributes = new[]
+            XmlRootAttributes = new[]
             {
                 new XmlAttribute
                 {

MediaBrowser.Dlna/Profiles/SonyBlurayPlayer2013Profile.cs

@@ -18,7 +18,7 @@ namespace MediaBrowser.Dlna.Profiles
                 ModelNumber = "BDP-2013"
             };
 
-            ContentDirectoryRootAttributes = new[]
+            XmlRootAttributes = new[]
             {
                 new XmlAttribute
                 {

MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs

@@ -33,7 +33,7 @@ namespace MediaBrowser.Dlna.Profiles
                 }
             };
 
-            ContentDirectoryRootAttributes = new[]
+            XmlRootAttributes = new[]
             {
                 new XmlAttribute
                 {

MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs

@@ -27,7 +27,7 @@ namespace MediaBrowser.Dlna.Profiles
                 }
             };
 
-            ContentDirectoryRootAttributes = new[]
+            XmlRootAttributes = new[]
             {
                 new XmlAttribute
                 {

MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs

@@ -26,7 +26,7 @@ namespace MediaBrowser.Dlna.Profiles
                 }
             };
 
-            ContentDirectoryRootAttributes = new[]
+            XmlRootAttributes = new[]
             {
                 new XmlAttribute
                 {

MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs

@@ -27,7 +27,7 @@ namespace MediaBrowser.Dlna.Profiles
                 }
             };
 
-            ContentDirectoryRootAttributes = new[]
+            XmlRootAttributes = new[]
             {
                 new XmlAttribute
                 {

MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs

@@ -26,7 +26,7 @@ namespace MediaBrowser.Dlna.Profiles
                 }
             };
 
-            ContentDirectoryRootAttributes = new[]
+            XmlRootAttributes = new[]
             {
                 new XmlAttribute
                 {

MediaBrowser.Dlna/Profiles/Xml/Default.xml

@@ -22,7 +22,7 @@
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes />
+  <XmlRootAttributes />
   <DirectPlayProfiles>
     <DirectPlayProfile container="mp3,wma" type="Audio" />
     <DirectPlayProfile container="avi,mp4" type="Video" />

MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml

@@ -27,7 +27,7 @@
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes />
+  <XmlRootAttributes />
   <DirectPlayProfiles>
     <DirectPlayProfile container="mp3,flac,m4a,wma" type="Audio" />
   </DirectPlayProfiles>

MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml

@@ -28,7 +28,7 @@
   <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes />
+  <XmlRootAttributes />
   <DirectPlayProfiles>
     <DirectPlayProfile container="ts" audioCodec="aac,ac3,mp3" videoCodec="h264" type="Video" />
     <DirectPlayProfile container="mkv" audioCodec="aac,ac3,mp3" videoCodec="h264" type="Video" />

MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml

@@ -26,7 +26,7 @@
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes />
+  <XmlRootAttributes />
   <DirectPlayProfiles>
     <DirectPlayProfile container="mp3,flac,m4a,wma" type="Audio" />
     <DirectPlayProfile container="avi,mp4,mkv,ts" type="Video" />

MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml

@@ -29,9 +29,9 @@
   <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes>
+  <XmlRootAttributes>
     <XmlAttribute name="xmlns:pv" value="http://www.pv.com/pvns/" />
-  </ContentDirectoryRootAttributes>
+  </XmlRootAttributes>
   <DirectPlayProfiles>
     <DirectPlayProfile container="mpeg" audioCodec="ac3,mp3" videoCodec="mpeg2video,mpeg4" type="Video" />
     <DirectPlayProfile container="mkv" audioCodec="aac,ac3,mp3,pcm" videoCodec="h264" type="Video" />

MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml

@@ -26,9 +26,9 @@
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes>
+  <XmlRootAttributes>
     <XmlAttribute name="xmlns:sec" value="http://www.sec.co.kr/" />
-  </ContentDirectoryRootAttributes>
+  </XmlRootAttributes>
   <DirectPlayProfiles>
     <DirectPlayProfile container="asf" audioCodec="mp3,ac3,wmav2,wmapro,wmavoice" videoCodec="h264,mpeg4,mjpeg" type="Video" />
     <DirectPlayProfile container="avi" audioCodec="mp3,ac3,dca" videoCodec="h264,mpeg4,mjpeg" type="Video" />

MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml

@@ -28,9 +28,9 @@
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes>
+  <XmlRootAttributes>
     <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </ContentDirectoryRootAttributes>
+  </XmlRootAttributes>
   <DirectPlayProfiles>
     <DirectPlayProfile container="ts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
     <DirectPlayProfile container="mpeg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />

MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml

@@ -30,9 +30,9 @@
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes>
+  <XmlRootAttributes>
     <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </ContentDirectoryRootAttributes>
+  </XmlRootAttributes>
   <DirectPlayProfiles>
     <DirectPlayProfile container="ts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
     <DirectPlayProfile container="mpeg" audioCodec="ac3,mp3,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />

MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml

@@ -30,9 +30,9 @@
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes>
+  <XmlRootAttributes>
     <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </ContentDirectoryRootAttributes>
+  </XmlRootAttributes>
   <DirectPlayProfiles>
     <DirectPlayProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" />
     <DirectPlayProfile container="ts" audioCodec="mp3,mp2" videoCodec="mpeg1video,mpeg2video" type="Video" />

MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml

@@ -30,9 +30,9 @@
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes>
+  <XmlRootAttributes>
     <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </ContentDirectoryRootAttributes>
+  </XmlRootAttributes>
   <DirectPlayProfiles>
     <DirectPlayProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" />
     <DirectPlayProfile container="ts" audioCodec="mp3,mp2" videoCodec="mpeg2video" type="Video" />

MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml

@@ -30,9 +30,9 @@
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes>
+  <XmlRootAttributes>
     <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </ContentDirectoryRootAttributes>
+  </XmlRootAttributes>
   <DirectPlayProfiles>
     <DirectPlayProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" />
     <DirectPlayProfile container="ts" audioCodec="mp3,mp2" videoCodec="mpeg2video" type="Video" />

MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml

@@ -30,9 +30,9 @@
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes>
+  <XmlRootAttributes>
     <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </ContentDirectoryRootAttributes>
+  </XmlRootAttributes>
   <DirectPlayProfiles>
     <DirectPlayProfile container="ts" audioCodec="ac3,eac3,aac,mp3" videoCodec="h264" type="Video" />
     <DirectPlayProfile container="ts" audioCodec="mp3,mp2" videoCodec="mpeg2video" type="Video" />

MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml

@@ -30,7 +30,7 @@
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes />
+  <XmlRootAttributes />
   <DirectPlayProfiles>
     <DirectPlayProfile container="mp3,wma" type="Audio" />
     <DirectPlayProfile container="avi,mp4" type="Video" />

MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml

@@ -29,7 +29,7 @@
   <TimelineOffsetSeconds>5</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes />
+  <XmlRootAttributes />
   <DirectPlayProfiles>
     <DirectPlayProfile container="avi" audioCodec="ac3,dca,mp2,mp3,pcm" videoCodec="mpeg1video,mpeg2video,mpeg4,h264,vc1" type="Video" />
     <DirectPlayProfile container="mpeg" audioCodec="ac3,dca,mp2,mp3,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />

MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml

@@ -29,7 +29,7 @@
   <TimelineOffsetSeconds>40</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>true</RequiresPlainVideoItems>
   <RequiresPlainFolders>true</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes />
+  <XmlRootAttributes />
   <DirectPlayProfiles>
     <DirectPlayProfile container="avi" audioCodec="ac3,mp3" videoCodec="mpeg4" type="Video" />
     <DirectPlayProfile container="avi" audioCodec="aac" videoCodec="h264" type="Video" />

MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml

@@ -27,7 +27,7 @@
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes />
+  <XmlRootAttributes />
   <DirectPlayProfiles>
     <DirectPlayProfile container="ts" audioCodec="ac3" videoCodec="h264" type="Video" />
     <DirectPlayProfile container="avi" audioCodec="ac3,mp3" videoCodec="mpeg4" type="Video" />

MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml

@@ -28,7 +28,7 @@
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
   <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
   <RequiresPlainFolders>false</RequiresPlainFolders>
-  <ContentDirectoryRootAttributes />
+  <XmlRootAttributes />
   <DirectPlayProfiles>
     <DirectPlayProfile container="mp3,wma" type="Audio" />
     <DirectPlayProfile container="avi,mp4" type="Video" />

MediaBrowser.Dlna/Server/ControlHandler.cs

@@ -337,7 +337,7 @@ namespace MediaBrowser.Dlna.Server
             didl.SetAttribute("xmlns:dlna", NS_DLNA);
             didl.SetAttribute("xmlns:upnp", NS_UPNP);
 
-            foreach (var att in _profile.ContentDirectoryRootAttributes)
+            foreach (var att in _profile.XmlRootAttributes)
             {
                 didl.SetAttribute(att.Name, att.Value);
             }

MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs

@@ -31,7 +31,13 @@ namespace MediaBrowser.Dlna.Server
             var builder = new StringBuilder();
 
             builder.Append("<?xml version=\"1.0\"?>");
-            builder.Append("<root xmlns=\"urn:schemas-upnp-org:device-1-0\" xmlns:dlna=\"urn:schemas-dlna-org:device-1-0\">");
+
+            builder.Append("<root xmlns=\"urn:schemas-upnp-org:device-1-0\" xmlns:dlna=\"urn:schemas-dlna-org:device-1-0\"");
+            foreach (var att in _profile.XmlRootAttributes)
+            {
+                builder.AppendFormat(" {0}=\"{1}\"", att.Name, att.Value);
+            }
+            builder.Append(">");
 
             builder.Append("<specVersion>");
             builder.Append("<major>1</major>");

MediaBrowser.Model/Dlna/DeviceProfile.cs

@@ -70,7 +70,7 @@ namespace MediaBrowser.Model.Dlna
         public bool RequiresPlainVideoItems { get; set; }
         public bool RequiresPlainFolders { get; set; }
 
-        public XmlAttribute[] ContentDirectoryRootAttributes { get; set; }
+        public XmlAttribute[] XmlRootAttributes { get; set; }
 
         /// <summary>
         /// Gets or sets the direct play profiles.
@@ -97,7 +97,7 @@ namespace MediaBrowser.Model.Dlna
             CodecProfiles = new CodecProfile[] { };
             ContainerProfiles = new ContainerProfile[] { };
 
-            ContentDirectoryRootAttributes = new XmlAttribute[] { };
+            XmlRootAttributes = new XmlAttribute[] { };
             
             SupportedMediaTypes = "Audio,Photo,Video";
         }