Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 6 insertions, 3 deletions

diff --git a/MediaBrowser.Dlna/PlayTo/Configuration/TranscodeSetting.cs b/MediaBrowser.Dlna/PlayTo/Configuration/TranscodeSetting.cs
index f5cceaaaa..ddf6f2187 100644
--- a/MediaBrowser.Dlna/PlayTo/Configuration/TranscodeSetting.cs
+++ b/MediaBrowser.Dlna/PlayTo/Configuration/TranscodeSetting.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Text.RegularExpressions;
 
 namespace MediaBrowser.Dlna.PlayTo.Configuration
 {
@@ -19,6 +20,8 @@ namespace MediaBrowser.Dlna.PlayTo.Configuration
         /// The target container.
         /// </value>
         public string TargetContainer { get; set; }
+      
+        public string MimeType { get; set; }
 
         /// <summary>
         /// The default transcoding settings
@@ -46,19 +49,19 @@ namespace MediaBrowser.Dlna.PlayTo.Configuration
             {
                 if (!string.IsNullOrEmpty(profile.FriendlyName))
                 {
-                    if (!string.Equals(deviceProperties.Name, profile.FriendlyName, StringComparison.OrdinalIgnoreCase))
+                    if (!Regex.IsMatch(deviceProperties.Name, profile.FriendlyName))
                         continue;
                 }
 
                 if (!string.IsNullOrEmpty(profile.ModelNumber))
                 {
-                    if (!string.Equals(deviceProperties.ModelNumber, profile.ModelNumber, StringComparison.OrdinalIgnoreCase))
+                    if (!Regex.IsMatch(deviceProperties.ModelNumber, profile.ModelNumber))
                         continue;
                 }
 
                 if (!string.IsNullOrEmpty(profile.ModelName))
                 {
-                    if (!string.Equals(deviceProperties.ModelName, profile.ModelName, StringComparison.OrdinalIgnoreCase))
+                    if (!Regex.IsMatch(deviceProperties.ModelName, profile.ModelName))
                         continue;
                 }