From f7061e353e05845076d41f7ee935f30756e17781 Mon Sep 17 00:00:00 2001 From: Ben Magee Date: Thu, 13 Dec 2018 09:18:29 +0000 Subject: [PATCH 1/3] Remove Emby branding from DLNA server --- Emby.Dlna/Api/DlnaServerService.cs | 4 +++- Emby.Dlna/Main/DlnaEntryPoint.cs | 6 +++--- Emby.Dlna/PlayTo/SsdpHttpClient.cs | 2 +- Emby.Dlna/Profiles/DefaultProfile.cs | 4 ++-- Emby.Dlna/Server/DescriptionXmlBuilder.cs | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Emby.Dlna/Api/DlnaServerService.cs b/Emby.Dlna/Api/DlnaServerService.cs index 663728f362..194ae73e06 100644 --- a/Emby.Dlna/Api/DlnaServerService.cs +++ b/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++; } diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs index 4bab30337f..b820b46c33 100644 --- a/Emby.Dlna/Main/DlnaEntryPoint.cs +++ b/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 Media Player", Uuid = udn // This must be a globally unique value that survives reboots etc. Get from storage or embedded hardware etc. }; diff --git a/Emby.Dlna/PlayTo/SsdpHttpClient.cs b/Emby.Dlna/PlayTo/SsdpHttpClient.cs index eaafaa65b1..bfd163bf16 100644 --- a/Emby.Dlna/PlayTo/SsdpHttpClient.cs +++ b/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; diff --git a/Emby.Dlna/Profiles/DefaultProfile.cs b/Emby.Dlna/Profiles/DefaultProfile.cs index ddc575700f..ca98adfeb8 100644 --- a/Emby.Dlna/Profiles/DefaultProfile.cs +++ b/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 Media Player"; ModelNumber = "01"; ModelUrl = "https://github.com/jellyfin/jellyfin"; ManufacturerUrl = "https://github.com/jellyfin/jellyfin"; diff --git a/Emby.Dlna/Server/DescriptionXmlBuilder.cs b/Emby.Dlna/Server/DescriptionXmlBuilder.cs index 988d45e075..0c0c367e43 100644 --- a/Emby.Dlna/Server/DescriptionXmlBuilder.cs +++ b/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(); From 051c67a537d552d3695fd6817fbd76dc0c35af8a Mon Sep 17 00:00:00 2001 From: Ben Magee Date: Thu, 13 Dec 2018 19:10:22 +0000 Subject: [PATCH 2/3] Updated strings to "Jellyfin Server" --- Emby.Dlna/Main/DlnaEntryPoint.cs | 2 +- Emby.Dlna/Profiles/DefaultProfile.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs index b820b46c33..cd535a98ab 100644 --- a/Emby.Dlna/Main/DlnaEntryPoint.cs +++ b/Emby.Dlna/Main/DlnaEntryPoint.cs @@ -274,7 +274,7 @@ namespace Emby.Dlna.Main Location = uri, // Must point to the URL that serves your devices UPnP description document. FriendlyName = "Jellyfin", Manufacturer = "Jellyfin", - ModelName = "Jellyfin Media Player", + ModelName = "Jellyfin Server", Uuid = udn // This must be a globally unique value that survives reboots etc. Get from storage or embedded hardware etc. }; diff --git a/Emby.Dlna/Profiles/DefaultProfile.cs b/Emby.Dlna/Profiles/DefaultProfile.cs index ca98adfeb8..b60a664ba6 100644 --- a/Emby.Dlna/Profiles/DefaultProfile.cs +++ b/Emby.Dlna/Profiles/DefaultProfile.cs @@ -16,7 +16,7 @@ namespace Emby.Dlna.Profiles Manufacturer = "Jellyfin"; ModelDescription = "UPnP/AV 1.0 Compliant Media Server"; - ModelName = "Jellyfin Media Player"; + ModelName = "Jellyfin Server"; ModelNumber = "01"; ModelUrl = "https://github.com/jellyfin/jellyfin"; ManufacturerUrl = "https://github.com/jellyfin/jellyfin"; From c58b3a0c47d789ec76bb4933d2cc9c9cdf2dc7b7 Mon Sep 17 00:00:00 2001 From: Ben Magee Date: Fri, 14 Dec 2018 00:02:55 +0000 Subject: [PATCH 3/3] Rebranded XML profiles --- Emby.Dlna/Profiles/Xml/Default.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Denon AVR.xml | 4 ++-- Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml | 4 ++-- Emby.Dlna/Profiles/Xml/LG Smart TV.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Marantz.xml | 4 ++-- Emby.Dlna/Profiles/Xml/MediaMonkey.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Panasonic Viera.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Popcorn Hour.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml | 4 ++-- Emby.Dlna/Profiles/Xml/WDTV Live.xml | 4 ++-- Emby.Dlna/Profiles/Xml/Xbox One.xml | 4 ++-- Emby.Dlna/Profiles/Xml/foobar2000.xml | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Emby.Dlna/Profiles/Xml/Default.xml b/Emby.Dlna/Profiles/Xml/Default.xml index 5d23a71ffe..9b862fec3a 100644 --- a/Emby.Dlna/Profiles/Xml/Default.xml +++ b/Emby.Dlna/Profiles/Xml/Default.xml @@ -1,9 +1,9 @@ Generic Device - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/Denon AVR.xml b/Emby.Dlna/Profiles/Xml/Denon AVR.xml index ff341e56f6..599726c512 100644 --- a/Emby.Dlna/Profiles/Xml/Denon AVR.xml +++ b/Emby.Dlna/Profiles/Xml/Denon AVR.xml @@ -6,9 +6,9 @@ Denon - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml b/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml index 211d5a1311..e640e86bfb 100644 --- a/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml +++ b/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml @@ -7,9 +7,9 @@ - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml b/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml index 865f8dd6ab..615774adff 100644 --- a/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml +++ b/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml @@ -8,9 +8,9 @@ - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/LG Smart TV.xml b/Emby.Dlna/Profiles/Xml/LG Smart TV.xml index ee4634e76e..21dccf5312 100644 --- a/Emby.Dlna/Profiles/Xml/LG Smart TV.xml +++ b/Emby.Dlna/Profiles/Xml/LG Smart TV.xml @@ -7,9 +7,9 @@ - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml b/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml index 17dc336a75..ac081bba30 100644 --- a/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml +++ b/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml @@ -5,9 +5,9 @@ DMA2100us - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/Marantz.xml b/Emby.Dlna/Profiles/Xml/Marantz.xml index b672d77a51..2bbdecde86 100644 --- a/Emby.Dlna/Profiles/Xml/Marantz.xml +++ b/Emby.Dlna/Profiles/Xml/Marantz.xml @@ -7,9 +7,9 @@ - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/MediaMonkey.xml b/Emby.Dlna/Profiles/Xml/MediaMonkey.xml index 83ddb6ac0a..955c30e854 100644 --- a/Emby.Dlna/Profiles/Xml/MediaMonkey.xml +++ b/Emby.Dlna/Profiles/Xml/MediaMonkey.xml @@ -7,9 +7,9 @@ - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml b/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml index 59d1fdd177..0da0e09260 100644 --- a/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml +++ b/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml @@ -8,9 +8,9 @@ - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml b/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml index a435d1484d..775d40b74d 100644 --- a/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml +++ b/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml @@ -1,9 +1,9 @@ Popcorn Hour - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml b/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml index 89167c9aa8..1362d8c38b 100644 --- a/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml +++ b/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml @@ -7,9 +7,9 @@ - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml b/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml index c9d428e571..dac2fdea44 100644 --- a/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml +++ b/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml @@ -7,9 +7,9 @@ - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml index 01d4bc0860..d1afc162ca 100644 --- a/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml +++ b/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml @@ -8,9 +8,9 @@ - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml b/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml index 47aa844881..090abe4175 100644 --- a/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml +++ b/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml @@ -8,9 +8,9 @@ - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/WDTV Live.xml b/Emby.Dlna/Profiles/Xml/WDTV Live.xml index f7e43368a9..db4ce4722b 100644 --- a/Emby.Dlna/Profiles/Xml/WDTV Live.xml +++ b/Emby.Dlna/Profiles/Xml/WDTV Live.xml @@ -8,9 +8,9 @@ - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/Xbox One.xml b/Emby.Dlna/Profiles/Xml/Xbox One.xml index a9a3028543..40e05f7fca 100644 --- a/Emby.Dlna/Profiles/Xml/Xbox One.xml +++ b/Emby.Dlna/Profiles/Xml/Xbox One.xml @@ -8,9 +8,9 @@ - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin diff --git a/Emby.Dlna/Profiles/Xml/foobar2000.xml b/Emby.Dlna/Profiles/Xml/foobar2000.xml index ba0fcf7393..19dc10e83a 100644 --- a/Emby.Dlna/Profiles/Xml/foobar2000.xml +++ b/Emby.Dlna/Profiles/Xml/foobar2000.xml @@ -7,9 +7,9 @@ - Emby + Jellyfin https://github.com/jellyfin/jellyfin - Emby Server + Jellyfin Server UPnP/AV 1.0 Compliant Media Server 01 https://github.com/jellyfin/jellyfin