Merge pull request #126 from BnMcG/125-dlna-branding

Remove Emby branding from DLNA server

Emby.Dlna/Api/DlnaServerService.cs

@@ -224,8 +224,10 @@ namespace Emby.Dlna.Api
             var first = pathInfo[0];
 
             // backwards compatibility
+            // TODO: Work out what this is doing.
             if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) ||
-                string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase))
+                string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(first, "jellyfin", StringComparison.OrdinalIgnoreCase ))
             {
                 index++;
             }

Emby.Dlna/Main/DlnaEntryPoint.cs

@@ -272,9 +272,9 @@ namespace Emby.Dlna.Main
                 {
                     CacheLifetime = TimeSpan.FromSeconds(1800), //How long SSDP clients can cache this info.
                     Location = uri, // Must point to the URL that serves your devices UPnP description document. 
-                    FriendlyName = "Emby Server",
-                    Manufacturer = "Emby",
-                    ModelName = "Emby Server",
+                    FriendlyName = "Jellyfin",
+                    Manufacturer = "Jellyfin",
+                    ModelName = "Jellyfin Server",
                     Uuid = udn
                     // This must be a globally unique value that survives reboots etc. Get from storage or embedded hardware etc.                
                 };

Emby.Dlna/PlayTo/SsdpHttpClient.cs

@@ -14,7 +14,7 @@ namespace Emby.Dlna.PlayTo
     public class SsdpHttpClient
     {
         private const string USERAGENT = "Microsoft-Windows/6.2 UPnP/1.0 Microsoft-DLNA DLNADOC/1.50";
-        private const string FriendlyName = "Emby";
+        private const string FriendlyName = "Jellyfin";
 
         private readonly IHttpClient _httpClient;
         private readonly IServerConfigurationManager _config;

Emby.Dlna/Profiles/DefaultProfile.cs

@@ -14,9 +14,9 @@ namespace Emby.Dlna.Profiles
 
             ProtocolInfo = "http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*";
 
-            Manufacturer = "Emby";
+            Manufacturer = "Jellyfin";
             ModelDescription = "UPnP/AV 1.0 Compliant Media Server";
-            ModelName = "Emby Server";
+            ModelName = "Jellyfin Server";
             ModelNumber = "01";
             ModelUrl = "https://github.com/jellyfin/jellyfin";
             ManufacturerUrl = "https://github.com/jellyfin/jellyfin";

Emby.Dlna/Profiles/Xml/Default.xml

@@ -1,9 +1,9 @@
 <?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>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

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

@@ -6,9 +6,9 @@
     <Manufacturer>Denon</Manufacturer>
     <Headers />
   </Identification>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml

@@ -7,9 +7,9 @@
       <HttpHeaderInfo name="User-Agent" value="DIRECTV" match="Substring" />
     </Headers>
   </Identification>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml

@@ -8,9 +8,9 @@
       <HttpHeaderInfo name="User-Agent" value="Zip_" match="Substring" />
     </Headers>
   </Identification>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

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

@@ -7,9 +7,9 @@
       <HttpHeaderInfo name="User-Agent" value="LG" match="Substring" />
     </Headers>
   </Identification>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

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

@@ -5,9 +5,9 @@
     <ModelName>DMA2100us</ModelName>
     <Headers />
   </Identification>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

Emby.Dlna/Profiles/Xml/Marantz.xml

@@ -7,9 +7,9 @@
       <HttpHeaderInfo name="User-Agent" value="Marantz" match="Substring" />
     </Headers>
   </Identification>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

Emby.Dlna/Profiles/Xml/MediaMonkey.xml

@@ -7,9 +7,9 @@
       <HttpHeaderInfo name="User-Agent" value="MediaMonkey" match="Substring" />
     </Headers>
   </Identification>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

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

@@ -8,9 +8,9 @@
       <HttpHeaderInfo name="User-Agent" value="Panasonic MIL DLNA" match="Substring" />
     </Headers>
   </Identification>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

Emby.Dlna/Profiles/Xml/Popcorn Hour.xml

@@ -1,9 +1,9 @@
 <?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>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

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

@@ -7,9 +7,9 @@
       <HttpHeaderInfo name="User-Agent" value="SEC_" match="Substring" />
     </Headers>
   </Identification>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml

@@ -7,9 +7,9 @@
       <HttpHeaderInfo name="User-Agent" value="Sharp" match="Substring" />
     </Headers>
   </Identification>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

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

@@ -8,9 +8,9 @@
       <HttpHeaderInfo name="X-AV-Client-Info" value="PLAYSTATION 3" match="Substring" />
     </Headers>
   </Identification>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml

@@ -8,9 +8,9 @@
       <HttpHeaderInfo name="X-AV-Client-Info" value="PLAYSTATION 4" match="Substring" />
     </Headers>
   </Identification>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

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

@@ -8,9 +8,9 @@
       <HttpHeaderInfo name="User-Agent" value="ALPHA Networks" match="Substring" />
     </Headers>
   </Identification>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

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

@@ -8,9 +8,9 @@
       <HttpHeaderInfo name="User-Agent" value="NSPlayer/12" match="Substring" />
     </Headers>
   </Identification>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

Emby.Dlna/Profiles/Xml/foobar2000.xml

@@ -7,9 +7,9 @@
       <HttpHeaderInfo name="User-Agent" value="foobar" match="Substring" />
     </Headers>
   </Identification>
-  <Manufacturer>Emby</Manufacturer>
+  <Manufacturer>Jellyfin</Manufacturer>
   <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Emby Server</ModelName>
+  <ModelName>Jellyfin Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
   <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>

Emby.Dlna/Server/DescriptionXmlBuilder.cs

@@ -217,7 +217,7 @@ namespace Emby.Dlna.Server
         {
             if (string.IsNullOrEmpty(_profile.FriendlyName))
             {
-                return "Emby - " + _serverName;
+                return "Jellyfin - " + _serverName;
             }
 
             var characterList = new List<char>();