lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2692 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-06-07 01:04:51 -04:00 committed by GitHub
commit c9ab6c0e34
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MediaBrowser.Model/Dlna/CodecProfile.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Xml.Serialization; using System.Xml.Serialization;
using MediaBrowser.Model.Dlna; using MediaBrowser.Model.Dlna;
using System.Linq;
namespace MediaBrowser.Model.Dlna namespace MediaBrowser.Model.Dlna
{ {
@ -26,24 +27,24 @@ namespace MediaBrowser.Model.Dlna
ApplyConditions = new ProfileCondition[] { }; ApplyConditions = new ProfileCondition[] { };
} }
public List<string> GetCodecs() private static List<string> SplitValue(string value)
{ {
List<string> list = new List<string>(); 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); if (!string.IsNullOrEmpty(i)) list.Add(i);
} }
return list; return list;
} }
public List<string> GetCodecs()
{
return SplitValue(Codec);
}
public List<string> GetContainers() public List<string> GetContainers()
{ {
List<string> list = new List<string>(); return SplitValue(Container);
foreach (string i in (Container ?? string.Empty).Split(','))
{
if (!string.IsNullOrEmpty(i)) list.Add(i);
}
return list;
} }
private bool ContainsContainer(string container) private bool ContainsContainer(string container)
@ -62,7 +63,8 @@ namespace MediaBrowser.Model.Dlna
List<string> codecs = GetCodecs(); 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));
} }
} }
} }

3
MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
View File

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

2
MediaBrowser.Server.Mono/Properties/AssemblyInfo.cs
View File

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

5
MediaBrowser.Server.Mono/SkiaSharp.dll.config Normal file
View File

@ -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>

2
SharedVersion.cs
View File

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