From 5e57b829d305e08f5b72b02611628df7b3756e02 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 7 Jun 2017 00:56:48 -0400 Subject: [PATCH] update CodecProfile checks --- MediaBrowser.Model/Dlna/CodecProfile.cs | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/MediaBrowser.Model/Dlna/CodecProfile.cs b/MediaBrowser.Model/Dlna/CodecProfile.cs index 29d4d21ecf..e04e04d218 100644 --- a/MediaBrowser.Model/Dlna/CodecProfile.cs +++ b/MediaBrowser.Model/Dlna/CodecProfile.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Xml.Serialization; using MediaBrowser.Model.Dlna; +using System.Linq; namespace MediaBrowser.Model.Dlna { @@ -26,24 +27,24 @@ namespace MediaBrowser.Model.Dlna ApplyConditions = new ProfileCondition[] { }; } - public List GetCodecs() + private static List SplitValue(string value) { List list = new List(); - foreach (string i in (Codec ?? string.Empty).Split(',')) + foreach (string i in (value ?? string.Empty).Split(',')) { if (!string.IsNullOrEmpty(i)) list.Add(i); } return list; } + public List GetCodecs() + { + return SplitValue(Codec); + } + public List GetContainers() { - List list = new List(); - foreach (string i in (Container ?? string.Empty).Split(',')) - { - if (!string.IsNullOrEmpty(i)) list.Add(i); - } - return list; + return SplitValue(Container); } private bool ContainsContainer(string container) @@ -62,7 +63,8 @@ namespace MediaBrowser.Model.Dlna List codecs = GetCodecs(); - return codecs.Count == 0 || ListHelper.ContainsIgnoreCase(codecs, codec); + return codecs.Count == 0 || ListHelper.ContainsIgnoreCase(codecs, SplitValue(codec)[0]); + //return codecs.Count == 0 || SplitValue(codec).Any(i => ListHelper.ContainsIgnoreCase(codecs, i)); } } }