aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-03-29 21:33:18 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-03-29 21:33:18 -0400
commit62cb2195eab0605b98c59d9dd08d6927c984969e (patch)
tree08e331ba756b2b0456c24d96eaf59bc803290545
parenteeef5439891ecf3a25d271ea9ec15629c66c4b10 (diff)
update dlna server friendly name
-rw-r--r--MediaBrowser.Dlna/Profiles/DefaultProfile.cs3
-rw-r--r--MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs5
2 files changed, 6 insertions, 2 deletions
diff --git a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs
index a8e6b1ca6..386a4eb1e 100644
--- a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs
+++ b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs
@@ -15,10 +15,9 @@ namespace MediaBrowser.Dlna.Profiles
XDlnaDoc = "DMS-1.50";
- FriendlyName = "Emby";
Manufacturer = "Emby";
ModelDescription = "Emby";
- ModelName = "Emby";
+ ModelName = "Emby Server";
ModelNumber = "Emby";
ModelUrl = "http://emby.media/";
ManufacturerUrl = "http://emby.media/";
diff --git a/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs b/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs
index 386370596..c4568a2ae 100644
--- a/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs
+++ b/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs
@@ -138,6 +138,11 @@ namespace MediaBrowser.Dlna.Server
private string GetFriendlyName()
{
+ if (string.IsNullOrWhiteSpace(_profile.FriendlyName))
+ {
+ return _serverName;
+ }
+
var characters = _serverName.Where(c => (char.IsLetterOrDigit(c) || c == '-')).ToArray();
var serverName = new string(characters);