diff --git a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/GlobalUsing.cs b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/GlobalUsing.cs index f17dda8..550b96b 100644 --- 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 . -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 deleted file mode 100644 index 71385e1..0000000 Binary files a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/MediaInfo-x64/MediaInfo.dll and /dev/null differ diff --git a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/MediaInfo-x86/MediaInfo.dll b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/MediaInfo-x86/MediaInfo.dll deleted file mode 100644 index 16747f3..0000000 Binary files a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/MediaInfo-x86/MediaInfo.dll and /dev/null differ diff --git a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/Plugin.cs b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/Plugin.cs index b50c8bd..6d887b1 100644 --- 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 . -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 index 8e32042..41a7e19 100644 --- a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/QuickLook.Plugin.VideoViewer.csproj +++ b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/QuickLook.Plugin.VideoViewer.csproj @@ -25,7 +25,7 @@ AnyCPU prompt - + ..\..\Build\Release\QuickLook.Plugin\QuickLook.Plugin.VideoViewer\ TRACE @@ -37,7 +37,12 @@ - + + MediaInfoWrapper + + + MediaInfoDLL + False @@ -67,12 +72,21 @@ PreserveNewest - + PreserveNewest + $(OutDir)MediaInfo-x64\ + MediaInfo-x64\MediaInfo.dll - + PreserveNewest + $(OutDir)MediaInfo-x86\ + MediaInfo-x86\MediaInfo.dll + PreserveNewest @@ -81,6 +95,10 @@ + + + + diff --git a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/ViewerPanel.xaml.cs b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/ViewerPanel.xaml.cs index 4f8cddf..75ac689 100644 --- 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 . -using MediaInfo; +extern alias MediaInfoWrapper; + +using MediaInfoWrapper::MediaInfo; using QuickLook.Common.Annotations; using QuickLook.Common.Helpers; using QuickLook.Common.Plugin;