Update MediaInfoDLL dependencies

QL-Win · Dec 28, 2024 · d5cf6e8 · d5cf6e8
1 parent a8653c0
commit d5cf6e8
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 7 deletions.
diff --git a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/GlobalUsing.cs b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/GlobalUsing.cs
@@ -15,4 +15,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-global using MediaInfoLib = MediaInfo.MediaInfo;
+extern alias MediaInfoWrapper;
+
+global using MediaInfoLib = MediaInfoWrapper::MediaInfo.MediaInfo;
diff --git a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/MediaInfo-x64/MediaInfo.dll b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/MediaInfo-x64/MediaInfo.dll
diff --git a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/MediaInfo-x86/MediaInfo.dll b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/MediaInfo-x86/MediaInfo.dll
diff --git a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/Plugin.cs b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/Plugin.cs
@@ -15,7 +15,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-using MediaInfo;
+extern alias MediaInfoWrapper;
+
+using MediaInfoWrapper::MediaInfo;
 using QuickLook.Common.Plugin;
 using System;
 using System.IO;

diff --git a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/QuickLook.Plugin.VideoViewer.csproj b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/QuickLook.Plugin.VideoViewer.csproj
@@ -25,7 +25,7 @@
         <PlatformTarget>AnyCPU</PlatformTarget>
         <ErrorReport>prompt</ErrorReport>
     </PropertyGroup>
-    
+
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
         <OutputPath>..\..\Build\Release\QuickLook.Plugin\QuickLook.Plugin.VideoViewer\</OutputPath>
         <DefineConstants>TRACE</DefineConstants>
@@ -37,7 +37,12 @@
 
     <ItemGroup>
         <PackageReference Include="QuickLook.WPFMediaKit" Version="2.3.0" />
-        <PackageReference Include="MediaInfo.Wrapper" Version="21.9.3" />
+        <PackageReference Include="MediaInfo.Wrapper" Version="21.9.3">
+            <Aliases>MediaInfoWrapper</Aliases>
+        </PackageReference>
+        <PackageReference Include="MediaInfoDLL" Version="24.12.0">
+            <Aliases>MediaInfoDLL</Aliases>
+        </PackageReference>
         <Reference Include="WindowsBase" />
         <Reference Include="DirectShowLib-2005, Version=2.1.0.26626, Culture=neutral, PublicKeyToken=67e7b740cdfc2d3f, processorArchitecture=MSIL">
             <SpecificVersion>False</SpecificVersion>
@@ -67,12 +72,21 @@
         <Content Include="LAVFilters-x86\**">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
-        <Content Include="MediaInfo-x64\MediaInfo.dll">
+        <Content Include="$(NuGetPackageRoot)\MediaInfoDLL\24.12.0\lib\netstandard2.0\x64\MediaInfo.dll">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <DestinationFolder>$(OutDir)MediaInfo-x64\</DestinationFolder>
+            <Link>MediaInfo-x64\MediaInfo.dll</Link>
         </Content>
-        <Content Include="MediaInfo-x86\MediaInfo.dll">
+        <Content Include="$(NuGetPackageRoot)\MediaInfoDLL\24.12.0\lib\netstandard2.0\x86\MediaInfo.dll">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <DestinationFolder>$(OutDir)MediaInfo-x86\</DestinationFolder>
+            <Link>MediaInfo-x86\MediaInfo.dll</Link>
         </Content>
+        <!--<Content Include="$(NuGetPackageRoot)\MediaInfoDLL\24.12.0\lib\netstandard2.0\arm64\MediaInfo.dll">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <DestinationFolder>$(OutDir)MediaInfo-ARM64\</DestinationFolder>
+            <Link>MediaInfo-ARM64\MediaInfo.dll</Link>
+        </Content>-->
         <Content Include="LibVlc\**">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
@@ -81,6 +95,10 @@
 
     <Target Name="ReduceReleasePackaging" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
         <Delete Files="$(OutputPath)\Melanchall_DryWetMidi_Native64.dylib" Condition="Exists('$(OutputPath)\Melanchall_DryWetMidi_Native64.dylib')" />
+		<!-- Keep MediaInfoDLL.dll for MediaInfoViewer to read the translations -->
+		<Delete Files="$(OutputPath)\MediaInfoDLL.dll" Condition="Exists('$(OutputPath)\MediaInfoDLL.dll')" />
+		<!-- MediaInfoDLL will copy the MediaInfo.dll file according to the architecture, we do not use this usage so delete it manually -->
+		<Delete Files="$(OutputPath)\MediaInfo.dll" Condition="Exists('$(OutputPath)\MediaInfo.dll')" />
     </Target>
 
     <ItemGroup>

diff --git a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/ViewerPanel.xaml.cs b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/ViewerPanel.xaml.cs
@@ -15,7 +15,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-using MediaInfo;
+extern alias MediaInfoWrapper;
+
+using MediaInfoWrapper::MediaInfo;
 using QuickLook.Common.Annotations;
 using QuickLook.Common.Helpers;
 using QuickLook.Common.Plugin;