diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-09-07 12:15:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-07 12:15:51 +0000 |
| commit | 106949f8288bc8c30a9347844776afff1171a85d (patch) | |
| tree | b0c63f61953f082ad70e1d5e6badae77b011bfb5 | |
| parent | 4c2d2af569675d1a841242533b912fc0bce0f272 (diff) | |
| parent | a2687fac5e4c591f10aed3134711e47052485859 (diff) | |
Merge pull request #4075 from BaronGreenback/simplified_dlnamanager
Simplified Code: Removed code which was never used.
| -rw-r--r-- | Emby.Dlna/DlnaManager.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/DeviceIdentification.cs | 6 |
2 files changed, 0 insertions, 15 deletions
diff --git a/Emby.Dlna/DlnaManager.cs b/Emby.Dlna/DlnaManager.cs index f7a07ac69..58ea8848c 100644 --- a/Emby.Dlna/DlnaManager.cs +++ b/Emby.Dlna/DlnaManager.cs @@ -126,7 +126,6 @@ namespace Emby.Dlna var builder = new StringBuilder(); builder.AppendLine("No matching device profile found. The default will need to be used."); - builder.AppendFormat(CultureInfo.InvariantCulture, "DeviceDescription:{0}", profile.DeviceDescription ?? string.Empty).AppendLine(); builder.AppendFormat(CultureInfo.InvariantCulture, "FriendlyName:{0}", profile.FriendlyName ?? string.Empty).AppendLine(); builder.AppendFormat(CultureInfo.InvariantCulture, "Manufacturer:{0}", profile.Manufacturer ?? string.Empty).AppendLine(); builder.AppendFormat(CultureInfo.InvariantCulture, "ManufacturerUrl:{0}", profile.ManufacturerUrl ?? string.Empty).AppendLine(); @@ -141,14 +140,6 @@ namespace Emby.Dlna private bool IsMatch(DeviceIdentification deviceInfo, DeviceIdentification profileInfo) { - if (!string.IsNullOrEmpty(profileInfo.DeviceDescription)) - { - if (deviceInfo.DeviceDescription == null || !IsRegexOrSubstringMatch(deviceInfo.DeviceDescription, profileInfo.DeviceDescription)) - { - return false; - } - } - if (!string.IsNullOrEmpty(profileInfo.FriendlyName)) { if (deviceInfo.FriendlyName == null || !IsRegexOrSubstringMatch(deviceInfo.FriendlyName, profileInfo.FriendlyName)) diff --git a/MediaBrowser.Model/Dlna/DeviceIdentification.cs b/MediaBrowser.Model/Dlna/DeviceIdentification.cs index 85cc9e3c1..43407383a 100644 --- a/MediaBrowser.Model/Dlna/DeviceIdentification.cs +++ b/MediaBrowser.Model/Dlna/DeviceIdentification.cs @@ -38,12 +38,6 @@ namespace MediaBrowser.Model.Dlna public string ModelDescription { get; set; } /// <summary> - /// Gets or sets the device description. - /// </summary> - /// <value>The device description.</value> - public string DeviceDescription { get; set; } - - /// <summary> /// Gets or sets the model URL. /// </summary> /// <value>The model URL.</value> |