mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 19:37:55 +02:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
37a69d78e1
1 changed files with 6 additions and 3 deletions
|
@ -1,4 +1,5 @@
|
|||
using System;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace MediaBrowser.Dlna.PlayTo.Configuration
|
||||
{
|
||||
|
@ -20,6 +21,8 @@ namespace MediaBrowser.Dlna.PlayTo.Configuration
|
|||
/// </value>
|
||||
public string TargetContainer { get; set; }
|
||||
|
||||
public string MimeType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The default transcoding settings
|
||||
/// </summary>
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue