update dlna profiles

24 files changed, 115 insertions, 575 deletions

diff --git a/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj b/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
index aed4ef421..2f4d44418 100644
--- a/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
+++ b/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
@@ -94,9 +94,7 @@
     <Compile Include="PlayTo\uParserObject.cs" />
     <Compile Include="Profiles\Foobar2000Profile.cs" />
     <Compile Include="Profiles\MediaMonkeyProfile.cs" />
-    <Compile Include="Profiles\Windows81Profile.cs" />
     <Compile Include="Profiles\WindowsMediaCenterProfile.cs" />
-    <Compile Include="Profiles\WindowsPhoneProfile.cs" />
     <Compile Include="ContentDirectory\ContentDirectory.cs" />
     <Compile Include="ContentDirectory\ControlHandler.cs" />
     <Compile Include="ContentDirectory\ServiceActionListBuilder.cs" />
diff --git a/MediaBrowser.Dlna/Profiles/Windows81Profile.cs b/MediaBrowser.Dlna/Profiles/Windows81Profile.cs
deleted file mode 100644
index cf7790c52..000000000
--- a/MediaBrowser.Dlna/Profiles/Windows81Profile.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Dlna.Profiles;
-using System.Xml.Serialization;
-
-namespace MediaBrowser.Dlna.Profiles
-{
-    [XmlRoot("Profile")]
-    public class Windows81Profile : DefaultProfile
-    {
-        public Windows81Profile()
-        {
-            Name = "Windows 8/RT";
-
-            Identification = new DeviceIdentification
-            {
-                Manufacturer = "Microsoft SDK Customer"
-            };
-
-            TranscodingProfiles = new[]
-            {
-                new TranscodingProfile
-                {
-                    Container = "mp3",
-                    AudioCodec = "mp3",
-                    Type = DlnaProfileType.Audio,
-                    Context = EncodingContext.Streaming
-                },
-                new TranscodingProfile
-                {
-                    Container = "mp3",
-                    AudioCodec = "mp3",
-                    Type = DlnaProfileType.Audio,
-                    Context = EncodingContext.Static
-                },
-                new TranscodingProfile
-                {
-                    Protocol = "hls",
-                    Container = "ts",
-                    VideoCodec = "h264",
-                    AudioCodec = "aac",
-                    Type = DlnaProfileType.Video,
-                    Context = EncodingContext.Streaming
-                },
-                new TranscodingProfile
-                {
-                    Container = "ts",
-                    VideoCodec = "h264",
-                    AudioCodec = "aac",
-                    Type = DlnaProfileType.Video,
-                    Context = EncodingContext.Streaming
-                },
-                new TranscodingProfile
-                {
-                    Container = "mp4",
-                    VideoCodec = "h264",
-                    AudioCodec = "aac,ac3,eac3",
-                    Type = DlnaProfileType.Video,
-                    Context = EncodingContext.Static
-                }
-            };
-
-            DirectPlayProfiles = new[]
-            {
-                new DirectPlayProfile
-                {
-                    Container = "mp4,mov",
-                    VideoCodec = "h264,mpeg4",
-                    AudioCodec = "aac,ac3,eac3,mp3,pcm",
-                    Type = DlnaProfileType.Video
-                },
-
-                new DirectPlayProfile
-                {
-                    Container = "ts",
-                    VideoCodec = "h264",
-                    AudioCodec = "aac,ac3,eac3,mp3,mp2,pcm",
-                    Type = DlnaProfileType.Video
-                },
-
-                new DirectPlayProfile
-                {
-                    Container = "asf",
-                    VideoCodec = "wmv2,wmv3,vc1",
-                    AudioCodec = "wmav2,wmapro,wmavoice",
-                    Type = DlnaProfileType.Video
-                },
-
-                new DirectPlayProfile
-                {
-                    Container = "avi",
-                    VideoCodec = "mpeg4,msmpeg4,mjpeg",
-                    AudioCodec = "mp3,ac3,eac3,mp2,pcm",
-                    Type = DlnaProfileType.Video
-                },
-
-                new DirectPlayProfile
-                {
-                    Container = "mp4",
-                    AudioCodec = "aac",
-                    Type = DlnaProfileType.Audio
-                },
-
-                new DirectPlayProfile
-                {
-                    Container = "mp3",
-                    AudioCodec = "mp3",
-                    Type = DlnaProfileType.Audio
-                },
-
-                new DirectPlayProfile
-                {
-                    Container = "m4a",
-                    AudioCodec = "aac",
-                    VideoCodec = "",
-                    Type = DlnaProfileType.Audio
-                },
-
-                new DirectPlayProfile
-                {
-                    Container = "jpeg",
-                    Type = DlnaProfileType.Photo
-                }
-            };
-
-            CodecProfiles = new[]
-            {
-                new CodecProfile
-                {
-                    Type = CodecType.Video,
-                    Codec="h264",
-                    Conditions = new []
-                    {
-                        
-                        // Note: Add any of the following if supported
-
-                                        //"Constrained Baseline",
-                                        //"Baseline",
-                                        //"Extended",
-                                        //"Main",
-                                        //"High",
-                                        //"Progressive High",
-                                        //"Constrained High"
-
-                        // The first one in the list should be the higest one, e.g. if High profile is supported, make sure it appears before baseline: high|baseline
-
-                        new ProfileCondition(ProfileConditionType.EqualsAny, ProfileConditionValue.VideoProfile, "high|main|extended|baseline|constrained baseline"),
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.VideoLevel,
-                            Value = "51"
-                        },
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.VideoBitDepth,
-                            Value = "8",
-                            IsRequired = false
-                        }
-                    }
-                },
-
-                new CodecProfile
-                {
-                    Type = CodecType.Video,
-                    Conditions = new []
-                    {
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.VideoBitDepth,
-                            Value = "8",
-                            IsRequired = false
-                        }
-                    }
-                },
-
-                new CodecProfile
-                {
-                    Type = CodecType.VideoAudio,
-                    Codec = "aac,eac3",
-                    Conditions = new []
-                    {
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.AudioChannels,
-                            Value = "8"
-                        }
-                    }
-                },
-
-                new CodecProfile
-                {
-                    Type = CodecType.VideoAudio,
-                    Codec = "ac3",
-                    Conditions = new []
-                    {
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.AudioChannels,
-                            Value = "6"
-                        }
-                    }
-                }
-            };
-
-            SubtitleProfiles = new[]
-            {
-                new SubtitleProfile
-                {
-                    Format = "vtt",
-                    Method = SubtitleDeliveryMethod.External
-                }
-            };
-        }
-    }
-}
diff --git a/MediaBrowser.Dlna/Profiles/WindowsPhoneProfile.cs b/MediaBrowser.Dlna/Profiles/WindowsPhoneProfile.cs
deleted file mode 100644
index 3a0ec1576..000000000
--- a/MediaBrowser.Dlna/Profiles/WindowsPhoneProfile.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Dlna.Profiles;
-using System.Xml.Serialization;
-
-namespace MediaBrowser.Dlna.Profiles
-{
-    [XmlRoot("Profile")]
-    public class WindowsPhoneProfile : DefaultProfile
-    {
-        public WindowsPhoneProfile()
-        {
-            Name = "Windows Phone";
-
-            TranscodingProfiles = new[]
-            {
-                new TranscodingProfile
-                {
-                    Container = "mp3",
-                    AudioCodec = "mp3",
-                    Type = DlnaProfileType.Audio,
-                    Context = EncodingContext.Streaming
-                },
-                new TranscodingProfile
-                {
-                    Container = "mp3",
-                    AudioCodec = "mp3",
-                    Type = DlnaProfileType.Audio,
-                    Context = EncodingContext.Static
-                },
-                new TranscodingProfile
-                {
-                    Protocol = "hls",
-                    Container = "ts",
-                    VideoCodec = "h264",
-                    AudioCodec = "aac",
-                    Type = DlnaProfileType.Video,
-                    Context = EncodingContext.Streaming
-                },
-                new TranscodingProfile
-                {
-                    Container = "mp4",
-                    VideoCodec = "h264",
-                    AudioCodec = "aac",
-                    Type = DlnaProfileType.Video,
-                    Context = EncodingContext.Streaming
-                },
-                new TranscodingProfile
-                {
-                    Container = "mp4",
-                    VideoCodec = "h264",
-                    AudioCodec = "aac",
-                    Type = DlnaProfileType.Video,
-                    Context = EncodingContext.Static
-                }
-            };
-
-            DirectPlayProfiles = new[]
-            {
-                new DirectPlayProfile
-                {
-                    Container = "mp4,mov",
-                    VideoCodec = "h264",
-                    AudioCodec = "aac,mp3",
-                    Type = DlnaProfileType.Video
-                },
-
-                new DirectPlayProfile
-                {
-                    Container = "mp4,avi",
-                    VideoCodec = "mpeg4,msmpeg4",
-                    AudioCodec = "aac,mp3",
-                    Type = DlnaProfileType.Video
-                },
-
-                new DirectPlayProfile
-                {
-                    Container = "asf",
-                    VideoCodec = "wmv2,wmv3,vc1",
-                    AudioCodec = "wmav2,wmapro,wmavoice",
-                    Type = DlnaProfileType.Video
-                },
-
-                new DirectPlayProfile
-                {
-                    Container = "asf",
-                    AudioCodec = "wmav2,wmapro,wmavoice",
-                    Type = DlnaProfileType.Audio
-                },
-
-                new DirectPlayProfile
-                {
-                    Container = "mp4,aac",
-                    AudioCodec = "aac",
-                    Type = DlnaProfileType.Audio
-                },
-
-                new DirectPlayProfile
-                {
-                    Container = "mp3",
-                    AudioCodec = "mp3",
-                    Type = DlnaProfileType.Audio
-                },
-
-                new DirectPlayProfile
-                {
-                    Container = "jpeg,png,gif,bmp",
-                    Type = DlnaProfileType.Photo
-                }
-            };
-
-            CodecProfiles = new[]
-            {
-                new CodecProfile
-                {
-                    Type = CodecType.Video,
-                    Codec="h264",
-                    Conditions = new []
-                    {
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.Width,
-                            Value = "800"
-                        },
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.Height,
-                            Value = "480"
-                        },
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.VideoBitrate,
-                            Value = "1000000",
-                            IsRequired = false
-                        },
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.VideoFramerate,
-                            Value = "24",
-                            IsRequired = false
-                        },
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.VideoLevel,
-                            Value = "3"
-                        },
-                        new ProfileCondition(ProfileConditionType.EqualsAny, ProfileConditionValue.VideoProfile, "baseline|constrained baseline"),
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.NotEquals,
-                            Property = ProfileConditionValue.IsAnamorphic,
-                            Value = "true"
-                        }
-                    }
-                },
-
-                new CodecProfile
-                {
-                    Type = CodecType.Video,
-                    Conditions = new []
-                    {
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.Width,
-                            Value = "800"
-                        },
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.Height,
-                            Value = "480"
-                        },
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.VideoBitrate,
-                            Value = "1000000",
-                            IsRequired = false
-                        },
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.VideoFramerate,
-                            Value = "24",
-                            IsRequired = false
-                        },
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.NotEquals,
-                            Property = ProfileConditionValue.IsAnamorphic,
-                            Value = "true"
-                        }
-                    }
-                },
-
-                new CodecProfile
-                {
-                    Type = CodecType.VideoAudio,
-                    Conditions = new []
-                    {
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.AudioBitrate,
-                            Value = "128000"
-                        },
-
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.AudioChannels,
-                            Value = "2"
-                        }
-                    }
-                },
-
-                new CodecProfile
-                {
-                    Type = CodecType.Audio,
-                    Conditions = new []
-                    {
-                        new ProfileCondition
-                        {
-                            Condition = ProfileConditionType.LessThanEqual,
-                            Property = ProfileConditionValue.AudioBitrate,
-                            Value = "128000"
-                        }
-                    }
-                }
-            };
-
-        }
-    }
-}
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Default.xml b/MediaBrowser.Dlna/Profiles/Xml/Default.xml
index 7062afc69..3c1fbfb1b 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Default.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Default.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Name>Generic Device</Name>
-  <FriendlyName>Media Browser</FriendlyName>
-  <Manufacturer>Media Browser</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
-  <ModelName>Media Browser</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
-  <ModelNumber>Media Browser</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <FriendlyName>Emby</FriendlyName>
+  <Manufacturer>Emby</Manufacturer>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
+  <ModelName>Emby</ModelName>
+  <ModelDescription>Emby</ModelDescription>
+  <ModelNumber>Emby</ModelNumber>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml
index 9ff1ae833..2fde80008 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml
@@ -6,13 +6,13 @@
     <Manufacturer>Denon</Manufacturer>
     <Headers />
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
-  <Manufacturer>Media Browser</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
-  <ModelName>Media Browser</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
-  <ModelNumber>Media Browser</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <FriendlyName>Emby</FriendlyName>
+  <Manufacturer>Emby</Manufacturer>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
+  <ModelName>Emby</ModelName>
+  <ModelDescription>Emby</ModelDescription>
+  <ModelNumber>Emby</ModelNumber>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml b/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml
index 746b7f5c4..7876ccc7c 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml
@@ -7,13 +7,13 @@
       <HttpHeaderInfo name="User-Agent" value="DIRECTV" match="Substring" />
     </Headers>
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
-  <Manufacturer>Media Browser</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
-  <ModelName>Media Browser</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
-  <ModelNumber>Media Browser</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <FriendlyName>Emby</FriendlyName>
+  <Manufacturer>Emby</Manufacturer>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
+  <ModelName>Emby</ModelName>
+  <ModelDescription>Emby</ModelDescription>
+  <ModelNumber>Emby</ModelNumber>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml b/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml
index 4a70e3d4c..d7ad1ac30 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml
@@ -8,13 +8,13 @@
       <HttpHeaderInfo name="User-Agent" value="XiP" match="Substring" />
     </Headers>
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
-  <Manufacturer>Media Browser</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
-  <ModelName>Media Browser</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
-  <ModelNumber>Media Browser</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <FriendlyName>Emby</FriendlyName>
+  <Manufacturer>Emby</Manufacturer>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
+  <ModelName>Emby</ModelName>
+  <ModelDescription>Emby</ModelDescription>
+  <ModelNumber>Emby</ModelNumber>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml
index 471917a13..a2fc002e5 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml
@@ -7,13 +7,13 @@
       <HttpHeaderInfo name="User-Agent" value="LG" match="Substring" />
     </Headers>
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
-  <Manufacturer>Media Browser</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
-  <ModelName>Media Browser</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
-  <ModelNumber>Media Browser</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <FriendlyName>Emby</FriendlyName>
+  <Manufacturer>Emby</Manufacturer>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
+  <ModelName>Emby</ModelName>
+  <ModelDescription>Emby</ModelDescription>
+  <ModelNumber>Emby</ModelNumber>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml
index 5fe441945..a273586bd 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml
@@ -5,13 +5,13 @@
     <ModelName>DMA2100us</ModelName>
     <Headers />
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
-  <Manufacturer>Media Browser</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
-  <ModelName>Media Browser</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
-  <ModelNumber>Media Browser</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <FriendlyName>Emby</FriendlyName>
+  <Manufacturer>Emby</Manufacturer>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
+  <ModelName>Emby</ModelName>
+  <ModelDescription>Emby</ModelDescription>
+  <ModelNumber>Emby</ModelNumber>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml b/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml
index 35775892c..e92b99830 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml
@@ -7,13 +7,13 @@
       <HttpHeaderInfo name="User-Agent" value="MediaMonkey" match="Substring" />
     </Headers>
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
-  <Manufacturer>Media Browser</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
-  <ModelName>Media Browser</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
-  <ModelNumber>Media Browser</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <FriendlyName>Emby</FriendlyName>
+  <Manufacturer>Emby</Manufacturer>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
+  <ModelName>Emby</ModelName>
+  <ModelDescription>Emby</ModelDescription>
+  <ModelNumber>Emby</ModelNumber>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml
index 36c528929..dcc06abb3 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml
@@ -8,13 +8,13 @@
       <HttpHeaderInfo name="User-Agent" value="Panasonic MIL DLNA" match="Substring" />
     </Headers>
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
-  <Manufacturer>Media Browser</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
-  <ModelName>Media Browser</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
-  <ModelNumber>Media Browser</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <FriendlyName>Emby</FriendlyName>
+  <Manufacturer>Emby</Manufacturer>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
+  <ModelName>Emby</ModelName>
+  <ModelDescription>Emby</ModelDescription>
+  <ModelNumber>Emby</ModelNumber>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml b/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml
index 0749dbeac..8470f601a 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Name>Popcorn Hour</Name>
-  <FriendlyName>Media Browser</FriendlyName>
-  <Manufacturer>Media Browser</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
-  <ModelName>Media Browser</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
-  <ModelNumber>Media Browser</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <FriendlyName>Emby</FriendlyName>
+  <Manufacturer>Emby</Manufacturer>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
+  <ModelName>Emby</ModelName>
+  <ModelDescription>Emby</ModelDescription>
+  <ModelNumber>Emby</ModelNumber>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml
index 9e61df43e..d8d2a0b2b 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml
@@ -7,13 +7,13 @@
       <HttpHeaderInfo name="User-Agent" value="SEC_" match="Substring" />
     </Headers>
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
-  <Manufacturer>Media Browser</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
-  <ModelName>Media Browser</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
-  <ModelNumber>Media Browser</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <FriendlyName>Emby</FriendlyName>
+  <Manufacturer>Emby</Manufacturer>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
+  <ModelName>Emby</ModelName>
+  <ModelDescription>Emby</ModelDescription>
+  <ModelNumber>Emby</ModelNumber>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
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 91aa767be..e4959c0c7 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml
@@ -7,13 +7,13 @@
     <Manufacturer>Sony</Manufacturer>
     <Headers />
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
+  <FriendlyName>Emby</FriendlyName>
   <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
   <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
+  <ModelDescription>Emby</ModelDescription>
   <ModelNumber>3.0</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml
index a6ea10840..b46b94c1d 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml
@@ -9,13 +9,13 @@
       <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="(Blu-ray Disc Player|Home Theater System|Home Theatre System|Media Player)" match="Regex" />
     </Headers>
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
+  <FriendlyName>Emby</FriendlyName>
   <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
   <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
+  <ModelDescription>Emby</ModelDescription>
   <ModelNumber>3.0</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml
index 0c3bdc4c5..ba993ca3e 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml
@@ -8,11 +8,11 @@
       <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}[EHLNPB]X\d[01]\d.*" match="Regex" />
     </Headers>
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
+  <FriendlyName>Emby</FriendlyName>
   <Manufacturer>Microsoft Corporation</Manufacturer>
   <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
   <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
+  <ModelDescription>Emby</ModelDescription>
   <ModelNumber>3.0</ModelNumber>
   <ModelUrl>http://www.microsoft.com/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml
index 0269c05c1..271cf1132 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml
@@ -8,11 +8,11 @@
       <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}([A-Z]X\d2\d|CX400).*" match="Regex" />
     </Headers>
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
+  <FriendlyName>Emby</FriendlyName>
   <Manufacturer>Microsoft Corporation</Manufacturer>
   <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
   <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
+  <ModelDescription>Emby</ModelDescription>
   <ModelNumber>3.0</ModelNumber>
   <ModelUrl>http://www.microsoft.com/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml
index 9aa614faa..4f849b731 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml
@@ -8,11 +8,11 @@
       <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}[A-Z]X\d5(\d|G).*" match="Regex" />
     </Headers>
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
+  <FriendlyName>Emby</FriendlyName>
   <Manufacturer>Microsoft Corporation</Manufacturer>
   <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
   <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
+  <ModelDescription>Emby</ModelDescription>
   <ModelNumber>3.0</ModelNumber>
   <ModelUrl>http://www.microsoft.com/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml
index 231db2091..e074b8389 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml
@@ -8,11 +8,11 @@
       <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}[WR][5689]\d{2}A.*" match="Regex" />
     </Headers>
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
+  <FriendlyName>Emby</FriendlyName>
   <Manufacturer>Microsoft Corporation</Manufacturer>
   <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
   <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
+  <ModelDescription>Emby</ModelDescription>
   <ModelNumber>3.0</ModelNumber>
   <ModelUrl>http://www.microsoft.com/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml
index 153b66be8..e90d1bc0f 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml
@@ -8,13 +8,13 @@
       <HttpHeaderInfo name="X-AV-Client-Info" value="PLAYSTATION 3" match="Substring" />
     </Headers>
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
-  <Manufacturer>Media Browser</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
-  <ModelName>Media Browser</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
-  <ModelNumber>Media Browser</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <FriendlyName>Emby</FriendlyName>
+  <Manufacturer>Emby</Manufacturer>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
+  <ModelName>Emby</ModelName>
+  <ModelDescription>Emby</ModelDescription>
+  <ModelNumber>Emby</ModelNumber>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml
index d51669cfb..3d7e745f8 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml
@@ -8,13 +8,13 @@
       <HttpHeaderInfo name="User-Agent" value="ALPHA Networks" match="Substring" />
     </Headers>
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
-  <Manufacturer>Media Browser</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
-  <ModelName>Media Browser</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
-  <ModelNumber>Media Browser</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <FriendlyName>Emby</FriendlyName>
+  <Manufacturer>Emby</Manufacturer>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
+  <ModelName>Emby</ModelName>
+  <ModelDescription>Emby</ModelDescription>
+  <ModelNumber>Emby</ModelNumber>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>true</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml
index da5572407..ae0f53edb 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml
@@ -12,7 +12,7 @@
   <Manufacturer>Microsoft Corporation</Manufacturer>
   <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
   <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
+  <ModelDescription>Emby</ModelDescription>
   <ModelNumber>12.0</ModelNumber>
   <ModelUrl>http://www.microsoft.com/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml
index 063cebebc..2595ffbdf 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml
@@ -8,13 +8,13 @@
       <HttpHeaderInfo name="User-Agent" value="NSPlayer" match="Substring" />
     </Headers>
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
-  <Manufacturer>Media Browser</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
-  <ModelName>Media Browser</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
-  <ModelNumber>Media Browser</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <FriendlyName>Emby</FriendlyName>
+  <Manufacturer>Emby</Manufacturer>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
+  <ModelName>Emby</ModelName>
+  <ModelDescription>Emby</ModelDescription>
+  <ModelNumber>Emby</ModelNumber>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
index de7c03c48..1418e63bd 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
@@ -7,13 +7,13 @@
       <HttpHeaderInfo name="User-Agent" value="foobar" match="Substring" />
     </Headers>
   </Identification>
-  <FriendlyName>Media Browser</FriendlyName>
-  <Manufacturer>Media Browser</Manufacturer>
-  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
-  <ModelName>Media Browser</ModelName>
-  <ModelDescription>Media Browser</ModelDescription>
-  <ModelNumber>Media Browser</ModelNumber>
-  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <FriendlyName>Emby</FriendlyName>
+  <Manufacturer>Emby</Manufacturer>
+  <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
+  <ModelName>Emby</ModelName>
+  <ModelDescription>Emby</ModelDescription>
+  <ModelNumber>Emby</ModelNumber>
+  <ModelUrl>http://emby.media/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>