فهرست منبع

Merge pull request #4075 from BaronGreenback/simplified_dlnamanager

Simplified Code: Removed code which was never used.
Bond-009 4 سال پیش
والد
کامیت
106949f828
2فایلهای تغییر یافته به همراه0 افزوده شده و 15 حذف شده
  1. 0 9
      Emby.Dlna/DlnaManager.cs
  2. 0 6
      MediaBrowser.Model/Dlna/DeviceIdentification.cs

+ 0 - 9
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))

+ 0 - 6
MediaBrowser.Model/Dlna/DeviceIdentification.cs

@@ -37,12 +37,6 @@ namespace MediaBrowser.Model.Dlna
         /// <value>The model description.</value>
         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>