From 8c6a3d85ba3af2576c86c0caaa7bab1bb3ed598b Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sat, 9 May 2015 12:58:40 -0700
Subject: [PATCH] Update ffms2 project

---
 build/ffms2/ffms2.vcxproj         | 23 --------------
 build/ffms2/ffms2.vcxproj.filters | 51 -------------------------------
 2 files changed, 74 deletions(-)

diff --git a/build/ffms2/ffms2.vcxproj b/build/ffms2/ffms2.vcxproj
index ad574ed25..3349db022 100644
--- a/build/ffms2/ffms2.vcxproj
+++ b/build/ffms2/ffms2.vcxproj
@@ -14,10 +14,6 @@
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Ffms2PreprocessorHaalisource Condition="'$(Ffms2UseAtl)'!='0'">HAALISOURCE;</Ffms2PreprocessorHaalisource>
-  </PropertyGroup>
-
   <!-- Project specific configuration -->
   <ItemDefinitionGroup>
     <ClCompile>
@@ -28,7 +24,6 @@
       <PreprocessorDefinitions>
         WITH_AVRESAMPLE;
         FFMS_EXPORTS;
-        $(Ffms2PreprocessorHaalisource)
         _CRT_SECURE_NO_WARNINGS;
         _CRT_NONSTDC_NO_DEPRECATE;
         _SCL_SECURE_NO_WARNINGS;
@@ -61,23 +56,12 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(FfmsSrcDir)\src\core\audiosource.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\codectype.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\ffms.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\filehandle.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\haaliaudio.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\haalicommon.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\haaliindexer.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\haalivideo.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\indexing.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\lavfaudio.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\lavfindexer.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\lavfvideo.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\matroskaaudio.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\matroskaindexer.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\matroskaparser.c" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\matroskareader.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\matroskavideo.cpp" />
-    <ClCompile Include="$(FfmsSrcDir)\src\core\numthreads.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\track.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\utils.cpp" />
     <ClCompile Include="$(FfmsSrcDir)\src\core\videosource.cpp" />
@@ -93,15 +77,8 @@
     <ClInclude Include="$(FfmsSrcDir)\src\avisynth\avsutils.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\avisynth\ffswscale.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\audiosource.h" />
-    <ClInclude Include="$(FfmsSrcDir)\src\core\codectype.h" />
-    <ClInclude Include="$(FfmsSrcDir)\src\core\coparser.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\filehandle.h" />
-    <ClInclude Include="$(FfmsSrcDir)\src\core\guids.h" />
-    <ClInclude Include="$(FfmsSrcDir)\src\core\haalicommon.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\indexing.h" />
-    <ClInclude Include="$(FfmsSrcDir)\src\core\matroskaparser.h" />
-    <ClInclude Include="$(FfmsSrcDir)\src\core\matroskareader.h" />
-    <ClInclude Include="$(FfmsSrcDir)\src\core\numthreads.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\track.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\utils.h" />
     <ClInclude Include="$(FfmsSrcDir)\src\core\videosource.h" />
diff --git a/build/ffms2/ffms2.vcxproj.filters b/build/ffms2/ffms2.vcxproj.filters
index b5dd48f1c..643120b19 100644
--- a/build/ffms2/ffms2.vcxproj.filters
+++ b/build/ffms2/ffms2.vcxproj.filters
@@ -27,51 +27,24 @@
     <ClCompile Include="$(FfmsSrcDir)\src\core\audiosource.cpp">
       <Filter>Audio</Filter>
     </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\haaliaudio.cpp">
-      <Filter>Audio</Filter>
-    </ClCompile>
     <ClCompile Include="$(FfmsSrcDir)\src\core\lavfaudio.cpp">
       <Filter>Audio</Filter>
     </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\matroskaaudio.cpp">
-      <Filter>Audio</Filter>
-    </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\haaliindexer.cpp">
-      <Filter>Indexing</Filter>
-    </ClCompile>
     <ClCompile Include="$(FfmsSrcDir)\src\core\indexing.cpp">
       <Filter>Indexing</Filter>
     </ClCompile>
     <ClCompile Include="$(FfmsSrcDir)\src\core\lavfindexer.cpp">
       <Filter>Indexing</Filter>
     </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\matroskaindexer.cpp">
-      <Filter>Indexing</Filter>
-    </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\haalivideo.cpp">
-      <Filter>Video</Filter>
-    </ClCompile>
     <ClCompile Include="$(FfmsSrcDir)\src\core\lavfvideo.cpp">
       <Filter>Video</Filter>
     </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\matroskavideo.cpp">
-      <Filter>Video</Filter>
-    </ClCompile>
     <ClCompile Include="$(FfmsSrcDir)\src\core\videosource.cpp">
       <Filter>Video</Filter>
     </ClCompile>
     <ClCompile Include="$(FfmsSrcDir)\src\core\ffms.cpp">
       <Filter>API</Filter>
     </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\codectype.cpp">
-      <Filter>Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\matroskaparser.c">
-      <Filter>Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\numthreads.cpp">
-      <Filter>Utils</Filter>
-    </ClCompile>
     <ClCompile Include="$(FfmsSrcDir)\src\core\utils.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
@@ -105,9 +78,6 @@
     <ClCompile Include="$(FfmsSrcDir)\src\core\filehandle.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
-    <ClCompile Include="$(FfmsSrcDir)\src\core\haalicommon.cpp">
-      <Filter>Utils</Filter>
-    </ClCompile>
     <ClCompile Include="$(FfmsSrcDir)\src\core\zipfile.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
@@ -128,24 +98,9 @@
     <ClInclude Include="$(FfmsSrcDir)\include\ffms.h">
       <Filter>API</Filter>
     </ClInclude>
-    <ClInclude Include="$(FfmsSrcDir)\src\core\coparser.h">
-      <Filter>Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="$(FfmsSrcDir)\src\core\codectype.h">
-      <Filter>Utils</Filter>
-    </ClInclude>
     <ClInclude Include="$(FfmsSrcDir)\include\ffmscompat.h">
       <Filter>Utils</Filter>
     </ClInclude>
-    <ClInclude Include="$(FfmsSrcDir)\src\core\guids.h">
-      <Filter>Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="$(FfmsSrcDir)\src\core\matroskaparser.h">
-      <Filter>Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="$(FfmsSrcDir)\src\core\numthreads.h">
-      <Filter>Utils</Filter>
-    </ClInclude>
     <ClInclude Include="$(FfmsSrcDir)\src\core\utils.h">
       <Filter>Utils</Filter>
     </ClInclude>
@@ -173,15 +128,9 @@
     <ClInclude Include="$(FfmsSrcDir)\src\vapoursynth\VapourSynth.h">
       <Filter>VapourSynth</Filter>
     </ClInclude>
-    <ClInclude Include="$(FfmsSrcDir)\src\core\matroskareader.h">
-      <Filter>Utils</Filter>
-    </ClInclude>
     <ClInclude Include="$(FfmsSrcDir)\src\core\filehandle.h">
       <Filter>Utils</Filter>
     </ClInclude>
-    <ClInclude Include="$(FfmsSrcDir)\src\core\haalicommon.h">
-      <Filter>Utils</Filter>
-    </ClInclude>
     <ClInclude Include="$(FfmsSrcDir)\src\core\zipfile.h">
       <Filter>Utils</Filter>
     </ClInclude>