Merge pull request #2692 from MediaBrowser/dev

Dev

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<string> GetCodecs()
+        private static List<string> SplitValue(string value)
         {
             List<string> list = new List<string>();
-            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<string> GetCodecs()
+        {
+            return SplitValue(Codec);
+        }
+
         public List<string> GetContainers()
         {
-            List<string> list = new List<string>();
-            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<string> 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));
         }
     }
 }

MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj

@@ -201,6 +201,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="packages.config" />
+    <None Include="SkiaSharp.dll.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SQLitePCLRaw.provider.sqlite3.dll.config">
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

MediaBrowser.Server.Mono/Properties/AssemblyInfo.cs

@@ -7,7 +7,7 @@ using System.Reflection;
 [assembly: AssemblyConfiguration ("")]
 [assembly: AssemblyCompany ("")]
 [assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("Luke")]
+[assembly: AssemblyCopyright ("Emby")]
 [assembly: AssemblyTrademark ("")]
 [assembly: AssemblyCulture ("")]
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".

MediaBrowser.Server.Mono/SkiaSharp.dll.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<dllmap dll="libSkiaSharp.dll" target="libSkiaSharp.dylib" os="osx" />
+	<dllmap dll="libSkiaSharp.dll" target="libSkiaSharp.so" os="!windows,osx" />
+</configuration>

SharedVersion.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.19.4")]
+[assembly: AssemblyVersion("3.2.19.5")]