Skip to content
Permalink
Browse files

Fix Linux MediaInfo

  • Loading branch information...
da3dsoul committed Oct 11, 2019
1 parent 5033f91 commit 43a4f3e484a0a3ccbae9519a2c44abe33e8d3a62
@@ -62,6 +62,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>

<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
<appSettings>

</appSettings>
<dllmap os="osx" dll="MediaInfo.dll" target="libmediainfo.0.dylib" />
<dllmap os="linux" dll="MediaInfo.dll" target="libmediainfo.so.0" />
<dllmap os="freebsd" dll="MediaInfo.dll" target="libmediainfo.so.0" />
<dllmap os="solaris" dll="MediaInfo.dll" target="libmediainfo.so.0.0.0" />
</configuration>
@@ -95,8 +95,8 @@ public static Media GetMediaInfoFromWrapper(string filename)

public static Media GetMediaInfo(string filename)
{
if (Utils.IsRunningOnMono())
return MediaInfoParserInternal.Convert(filename, ServerSettings.Instance.Import.MediaInfoTimeoutMinutes);
// if (Utils.IsRunningOnMono())
// return MediaInfoParserInternal.Convert(filename, ServerSettings.Instance.Import.MediaInfoTimeoutMinutes);
return GetMediaInfoFromWrapper(filename);
}
}

0 comments on commit 43a4f3e

Please sign in to comment.
You can’t perform that action at this time.