From c6d9bdfd497c2e3ef4ea8882cfa9c58b8ec2cb19 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 24 Apr 2014 10:11:05 -0400 Subject: [PATCH] updated dlna profiles --- MediaBrowser.Dlna/Didl/DidlBuilder.cs | 2 +- MediaBrowser.Dlna/Profiles/Foobar2000Profile.cs | 3 +-- MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs | 2 +- MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs | 2 +- MediaBrowser.Dlna/Profiles/SonyBlurayPlayer2013Profile.cs | 2 +- MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs | 2 +- MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs | 2 +- MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs | 2 +- MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs | 2 +- MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs | 2 +- MediaBrowser.Dlna/Profiles/Xml/Default.xml | 2 +- MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml | 2 +- MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml | 2 +- MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml | 2 +- MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml | 4 ++-- MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml | 4 ++-- .../Profiles/Xml/Sony Blu-ray Player 2013.xml | 4 ++-- MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml | 4 ++-- MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml | 4 ++-- MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml | 4 ++-- MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml | 4 ++-- MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml | 4 ++-- MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml | 2 +- MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml | 2 +- MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml | 2 +- MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml | 2 +- MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml | 2 +- MediaBrowser.Dlna/Server/ControlHandler.cs | 2 +- MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs | 8 +++++++- MediaBrowser.Model/Dlna/DeviceProfile.cs | 4 ++-- 30 files changed, 45 insertions(+), 40 deletions(-) diff --git a/MediaBrowser.Dlna/Didl/DidlBuilder.cs b/MediaBrowser.Dlna/Didl/DidlBuilder.cs index 4209e0f156..32b49ef9cc 100644 --- a/MediaBrowser.Dlna/Didl/DidlBuilder.cs +++ b/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); } diff --git a/MediaBrowser.Dlna/Profiles/Foobar2000Profile.cs b/MediaBrowser.Dlna/Profiles/Foobar2000Profile.cs index 1eae3fa934..3c94c5671d 100644 --- a/MediaBrowser.Dlna/Profiles/Foobar2000Profile.cs +++ b/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 { diff --git a/MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs b/MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs index 2968bcd5fa..26229b62b2 100644 --- a/MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs +++ b/MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs @@ -26,7 +26,7 @@ namespace MediaBrowser.Dlna.Profiles } }; - ContentDirectoryRootAttributes = new[] + XmlRootAttributes = new[] { new XmlAttribute { diff --git a/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs b/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs index 69203f3425..30f62e81cd 100644 --- a/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs +++ b/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs @@ -17,7 +17,7 @@ namespace MediaBrowser.Dlna.Profiles ModelUrl = "samsung.com" }; - ContentDirectoryRootAttributes = new[] + XmlRootAttributes = new[] { new XmlAttribute { diff --git a/MediaBrowser.Dlna/Profiles/SonyBlurayPlayer2013Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBlurayPlayer2013Profile.cs index bc6ac98ca5..01ee7fd68d 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBlurayPlayer2013Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBlurayPlayer2013Profile.cs @@ -18,7 +18,7 @@ namespace MediaBrowser.Dlna.Profiles ModelNumber = "BDP-2013" }; - ContentDirectoryRootAttributes = new[] + XmlRootAttributes = new[] { new XmlAttribute { diff --git a/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs b/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs index bb5a109da2..d2e6d7c15f 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs @@ -33,7 +33,7 @@ namespace MediaBrowser.Dlna.Profiles } }; - ContentDirectoryRootAttributes = new[] + XmlRootAttributes = new[] { new XmlAttribute { diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs index d3c0ae7a78..6167f553c8 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs @@ -27,7 +27,7 @@ namespace MediaBrowser.Dlna.Profiles } }; - ContentDirectoryRootAttributes = new[] + XmlRootAttributes = new[] { new XmlAttribute { diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs index 65a3cdb0dc..27387250b0 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs @@ -26,7 +26,7 @@ namespace MediaBrowser.Dlna.Profiles } }; - ContentDirectoryRootAttributes = new[] + XmlRootAttributes = new[] { new XmlAttribute { diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs index 5a818d0adc..e64710d8b5 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs @@ -27,7 +27,7 @@ namespace MediaBrowser.Dlna.Profiles } }; - ContentDirectoryRootAttributes = new[] + XmlRootAttributes = new[] { new XmlAttribute { diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs index 5923bce4cf..aece3857d4 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs @@ -26,7 +26,7 @@ namespace MediaBrowser.Dlna.Profiles } }; - ContentDirectoryRootAttributes = new[] + XmlRootAttributes = new[] { new XmlAttribute { diff --git a/MediaBrowser.Dlna/Profiles/Xml/Default.xml b/MediaBrowser.Dlna/Profiles/Xml/Default.xml index e9b920d171..f556e85042 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Default.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Default.xml @@ -22,7 +22,7 @@ 0 false false - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml index 7ee3abdde1..56a55ba029 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml @@ -27,7 +27,7 @@ 0 false false - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml index aec6d2cc1b..f449d5deee 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml @@ -28,7 +28,7 @@ 10 false false - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml index a0a4f502cf..9c2fb22e82 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml @@ -26,7 +26,7 @@ 0 false false - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml index 4f8ae88e35..bc661d4395 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml @@ -29,9 +29,9 @@ 10 false false - + - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml index 1371710cc7..b99ecf8728 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml @@ -26,9 +26,9 @@ 0 false false - + - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml index 86ced11506..352299e0fc 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml @@ -28,9 +28,9 @@ 0 false false - + - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml index 22b3b2ce50..af35b5f1ac 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml @@ -30,9 +30,9 @@ 0 false false - + - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml index 40605bc4e2..7933c6199e 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml @@ -30,9 +30,9 @@ 0 false false - + - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml index 561bd2c00e..a15fd9e351 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml @@ -30,9 +30,9 @@ 0 false false - + - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml index b62b60a66b..3c14ce8538 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml @@ -30,9 +30,9 @@ 0 false false - + - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml index ea78552c68..c1a6f71a5a 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml @@ -30,9 +30,9 @@ 0 false false - + - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml index f27f5aa4a6..f870ac1b44 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml @@ -30,7 +30,7 @@ 0 false false - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml index bee389b69f..3605003e11 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml @@ -29,7 +29,7 @@ 5 false false - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml index c72f404396..835b00d7ba 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml @@ -29,7 +29,7 @@ 40 true true - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml index c2aae9ef4b..bbe2d5bcff 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml @@ -27,7 +27,7 @@ 0 false false - + diff --git a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml index a80dff73e9..0b7e10c017 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml @@ -28,7 +28,7 @@ 0 false false - + diff --git a/MediaBrowser.Dlna/Server/ControlHandler.cs b/MediaBrowser.Dlna/Server/ControlHandler.cs index b28ec010e8..82cdf927c5 100644 --- a/MediaBrowser.Dlna/Server/ControlHandler.cs +++ b/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); } diff --git a/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs b/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs index 4b66e489f5..61b03a292d 100644 --- a/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs +++ b/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs @@ -31,7 +31,13 @@ namespace MediaBrowser.Dlna.Server var builder = new StringBuilder(); builder.Append(""); - builder.Append(""); + + builder.Append(""); builder.Append(""); builder.Append("1"); diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs index 96ff108962..f6ca6b48f1 100644 --- a/MediaBrowser.Model/Dlna/DeviceProfile.cs +++ b/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; } /// /// 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"; }