diff options
Diffstat (limited to 'MediaBrowser.Model/Dlna')
| -rw-r--r-- | MediaBrowser.Model/Dlna/CodecProfile.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/DeviceProfile.cs | 14 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/Filter.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 7 |
4 files changed, 15 insertions, 18 deletions
diff --git a/MediaBrowser.Model/Dlna/CodecProfile.cs b/MediaBrowser.Model/Dlna/CodecProfile.cs index 3e67b49f91..c2d36dc792 100644 --- a/MediaBrowser.Model/Dlna/CodecProfile.cs +++ b/MediaBrowser.Model/Dlna/CodecProfile.cs @@ -1,6 +1,5 @@ -using System; +using MediaBrowser.Model.Extensions; using System.Collections.Generic; -using System.Linq; using System.Xml.Serialization; namespace MediaBrowser.Model.Dlna @@ -34,7 +33,7 @@ namespace MediaBrowser.Model.Dlna { List<string> codecs = GetCodecs(); - return codecs.Count == 0 || codecs.Contains(codec, StringComparer.OrdinalIgnoreCase); + return codecs.Count == 0 || ListHelper.ContainsIgnoreCase(codecs, codec); } } } diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs index 2ed483fa10..3cb3b383eb 100644 --- a/MediaBrowser.Model/Dlna/DeviceProfile.cs +++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs @@ -131,7 +131,7 @@ namespace MediaBrowser.Model.Dlna continue; } - if (!i.GetAudioCodecs().Contains(audioCodec ?? string.Empty, StringComparer.OrdinalIgnoreCase)) + if (!ListHelper.ContainsIgnoreCase(i.GetAudioCodecs(), audioCodec ?? string.Empty)) { continue; } @@ -184,13 +184,13 @@ namespace MediaBrowser.Model.Dlna } List<string> containers = i.GetContainers(); - if (containers.Count > 0 && !containers.Contains(container, StringComparer.OrdinalIgnoreCase)) + if (containers.Count > 0 && !ListHelper.ContainsIgnoreCase(containers, container)) { continue; } List<string> audioCodecs = i.GetAudioCodecs(); - if (audioCodecs.Count > 0 && !audioCodecs.Contains(audioCodec ?? string.Empty, StringComparer.OrdinalIgnoreCase)) + if (audioCodecs.Count > 0 && !ListHelper.ContainsIgnoreCase(audioCodecs, audioCodec)) { continue; } @@ -229,7 +229,7 @@ namespace MediaBrowser.Model.Dlna } List<string> containers = i.GetContainers(); - if (containers.Count > 0 && !containers.Contains(container, StringComparer.OrdinalIgnoreCase)) + if (containers.Count > 0 && !ListHelper.ContainsIgnoreCase(containers, container)) { continue; } @@ -281,19 +281,19 @@ namespace MediaBrowser.Model.Dlna } List<string> containers = i.GetContainers(); - if (containers.Count > 0 && !containers.Contains(container, StringComparer.OrdinalIgnoreCase)) + if (containers.Count > 0 && !ListHelper.ContainsIgnoreCase(containers, container)) { continue; } List<string> audioCodecs = i.GetAudioCodecs(); - if (audioCodecs.Count > 0 && !audioCodecs.Contains(audioCodec ?? string.Empty, StringComparer.OrdinalIgnoreCase)) + if (audioCodecs.Count > 0 && !ListHelper.ContainsIgnoreCase(audioCodecs, audioCodec)) { continue; } List<string> videoCodecs = i.GetVideoCodecs(); - if (videoCodecs.Count > 0 && !videoCodecs.Contains(videoCodec ?? string.Empty, StringComparer.OrdinalIgnoreCase)) + if (videoCodecs.Count > 0 && !ListHelper.ContainsIgnoreCase(videoCodecs, videoCodec)) { continue; } diff --git a/MediaBrowser.Model/Dlna/Filter.cs b/MediaBrowser.Model/Dlna/Filter.cs index d92f881ce3..b827a4a228 100644 --- a/MediaBrowser.Model/Dlna/Filter.cs +++ b/MediaBrowser.Model/Dlna/Filter.cs @@ -1,7 +1,6 @@ -using System; +using MediaBrowser.Model.Extensions; +using System; using System.Collections.Generic; -using System.Linq; -using MediaBrowser.Model.Extensions; namespace MediaBrowser.Model.Dlna { @@ -28,7 +27,7 @@ namespace MediaBrowser.Model.Dlna public bool Contains(string field) { - return _all || _fields.Contains(field, StringComparer.OrdinalIgnoreCase); + return _all || ListHelper.ContainsIgnoreCase(_fields, field); } } } diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index 7472d4eafb..4f7f6277ed 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -4,7 +4,6 @@ using MediaBrowser.Model.Extensions; using MediaBrowser.Model.MediaInfo; using System; using System.Collections.Generic; -using System.Linq; namespace MediaBrowser.Model.Dlna { @@ -354,7 +353,7 @@ namespace MediaBrowser.Model.Dlna foreach (ContainerProfile i in profile.ContainerProfiles) { if (i.Type == DlnaProfileType.Video && - i.GetContainers().Contains(container, StringComparer.OrdinalIgnoreCase)) + ListHelper.ContainsIgnoreCase(i.GetContainers(), container)) { conditions.AddRange(i.Conditions); } @@ -639,7 +638,7 @@ namespace MediaBrowser.Model.Dlna if (videoCodecs.Count > 0) { string videoCodec = videoStream == null ? null : videoStream.Codec; - if (string.IsNullOrEmpty(videoCodec) || !videoCodecs.Contains(videoCodec, StringComparer.OrdinalIgnoreCase)) + if (string.IsNullOrEmpty(videoCodec) || !ListHelper.ContainsIgnoreCase(videoCodecs, videoCodec)) { return false; } @@ -650,7 +649,7 @@ namespace MediaBrowser.Model.Dlna { // Check audio codecs string audioCodec = audioStream == null ? null : audioStream.Codec; - if (string.IsNullOrEmpty(audioCodec) || !audioCodecs.Contains(audioCodec, StringComparer.OrdinalIgnoreCase)) + if (string.IsNullOrEmpty(audioCodec) || !ListHelper.ContainsIgnoreCase(audioCodecs, audioCodec)) { return false; } |