# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1517852301 0
# Node ID 46109b1ec46ea9fbc9ef787400e9ed3da1a078f0
# Parent  dc462bfe4af967d4286e649e70817a5d420260c9
Split out qm-dsp project

diff -r dc462bfe4af9 -r 46109b1ec46e .hgignore
--- a/.hgignore	Fri Feb 02 18:01:25 2018 +0000
+++ b/.hgignore	Mon Feb 05 17:38:21 2018 +0000
@@ -9,3 +9,4 @@
 build/msvc/Release
 build/msvc/x64/Debug
 build/msvc/x64/Release
+re:^build/mingw32/x64/Release/
diff -r dc462bfe4af9 -r 46109b1ec46e build/msvc/QMVampPlugins.sln
--- a/build/msvc/QMVampPlugins.sln	Fri Feb 02 18:01:25 2018 +0000
+++ b/build/msvc/QMVampPlugins.sln	Mon Feb 05 17:38:21 2018 +0000
@@ -4,6 +4,11 @@
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QMVampPlugins", "QMVampPlugins.vcxproj", "{1F995CF1-8B4B-445C-824D-09B3268DB29D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5B452691-B096-4129-972B-612BD29C92DF} = {5B452691-B096-4129-972B-612BD29C92DF}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QMDSP", "..\..\lib\qm-dsp\build\msvc\QMDSP.vcxproj", "{5B452691-B096-4129-972B-612BD29C92DF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,6 +26,14 @@
 		{1F995CF1-8B4B-445C-824D-09B3268DB29D}.Release|x64.Build.0 = Release|x64
 		{1F995CF1-8B4B-445C-824D-09B3268DB29D}.Release|x86.ActiveCfg = Release|Win32
 		{1F995CF1-8B4B-445C-824D-09B3268DB29D}.Release|x86.Build.0 = Release|Win32
+		{5B452691-B096-4129-972B-612BD29C92DF}.Debug|x64.ActiveCfg = Debug|x64
+		{5B452691-B096-4129-972B-612BD29C92DF}.Debug|x64.Build.0 = Debug|x64
+		{5B452691-B096-4129-972B-612BD29C92DF}.Debug|x86.ActiveCfg = Debug|Win32
+		{5B452691-B096-4129-972B-612BD29C92DF}.Debug|x86.Build.0 = Debug|Win32
+		{5B452691-B096-4129-972B-612BD29C92DF}.Release|x64.ActiveCfg = Release|x64
+		{5B452691-B096-4129-972B-612BD29C92DF}.Release|x64.Build.0 = Release|x64
+		{5B452691-B096-4129-972B-612BD29C92DF}.Release|x86.ActiveCfg = Release|Win32
+		{5B452691-B096-4129-972B-612BD29C92DF}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff -r dc462bfe4af9 -r 46109b1ec46e build/msvc/QMVampPlugins.vcxproj
--- a/build/msvc/QMVampPlugins.vcxproj	Fri Feb 02 18:01:25 2018 +0000
+++ b/build/msvc/QMVampPlugins.vcxproj	Mon Feb 05 17:38:21 2018 +0000
@@ -116,86 +116,11 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/EXPORT:vampGetPluginDescriptor %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>$(ProjectDir)\lib64\libopenblas.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SolutionDir)\$(Platform)\$(Configuration)\qm-dsp.lib;$(ProjectDir)\lib64\libopenblas.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\libmain.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\base\KaiserWindow.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\base\Pitch.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\base\SincWindow.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\chromagram\Chromagram.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\chromagram\ConstantQ.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\chromagram\CQprecalc.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\keydetection\GetKeyMode.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\mfcc\MFCC.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\onsets\DetectionFunction.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\onsets\PeakPicking.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\phasevocoder\PhaseVocoder.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\rateconversion\Decimator.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\rateconversion\DecimatorB.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\rateconversion\Resampler.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\rhythm\BeatSpectrum.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\segmentation\ClusterMeltSegmenter.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\segmentation\cluster_melt.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\segmentation\cluster_segmenter.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\segmentation\Segmenter.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\signalconditioning\DFProcess.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\signalconditioning\Filter.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\signalconditioning\FiltFilt.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\signalconditioning\Framer.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\tempotracking\DownBeat.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\tempotracking\TempoTrack.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\tempotracking\TempoTrackV2.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\tonal\ChangeDetectionFunction.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\tonal\TCSgram.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\tonal\TonalEstimator.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\transforms\DCT.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\transforms\FFTqm.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\dsp\wavelet\Wavelet.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\cblas_ddot.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\cblas_dgemm.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\cblas_globals.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\cblas_xerbla.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\ddot.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\dgemm.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\dgemv.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\dger.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\dscal.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\dswap.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\dtrmm.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\dtrmv.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\dtrsm.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\idamax.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\cblas\src\lsame.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\dgetf2.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\dgetrf.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\dgetri.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\dlaswp.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\dtrti2.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\dtrtri.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\exit_.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\f77_aloc.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\ieeeck.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\ilaenv.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\iparmq.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\i_nint.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\pow_di.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\s_cat.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\s_cmp.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\s_copy.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\clapack\src\xerbla.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\kissfft\kiss_fft.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\ext\kissfft\tools\kiss_fftr.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\hmm\hmm.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\maths\Correlation.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\maths\CosineDistance.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\maths\KLDivergence.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\maths\MathUtilities.cpp" />
-    <ClCompile Include="..\..\lib\qm-dsp\maths\pca\pca.c" />
-    <ClCompile Include="..\..\lib\qm-dsp\thread\Thread.cpp" />
-    <ClCompile Include="..\..\lib\vamp-plugin-sdk\examples\AmplitudeFollower.cpp" />
-    <ClCompile Include="..\..\lib\vamp-plugin-sdk\examples\FixedTempoEstimator.cpp" />
     <ClCompile Include="..\..\lib\vamp-plugin-sdk\src\vamp-sdk\FFT.cpp" />
     <ClCompile Include="..\..\lib\vamp-plugin-sdk\src\vamp-sdk\PluginAdapter.cpp" />
     <ClCompile Include="..\..\lib\vamp-plugin-sdk\src\vamp-sdk\RealTime.cpp" />
@@ -214,99 +139,6 @@
     <ClCompile Include="..\..\plugins\Transcription.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\lib\qm-dsp\build\general\Makefile.inc" />
-    <None Include="..\..\lib\vamp-plugin-sdk\skeleton\Makefile.inc" />
-    <None Include="..\general\Makefile.inc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\lib\qm-dsp\base\KaiserWindow.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\base\Pitch.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\base\SincWindow.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\base\Window.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\build\mingw32\mkspecs\win32-x-g++\qplatformdefs.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\chromagram\Chromagram.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\chromagram\ConstantQ.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\keydetection\GetKeyMode.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\mfcc\MFCC.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\onsets\DetectionFunction.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\onsets\PeakPicking.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\phasevocoder\PhaseVocoder.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\rateconversion\Decimator.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\rateconversion\DecimatorB.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\rateconversion\Resampler.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\rhythm\BeatSpectrum.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\segmentation\ClusterMeltSegmenter.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\segmentation\cluster_melt.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\segmentation\cluster_segmenter.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\segmentation\segment.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\segmentation\Segmenter.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\signalconditioning\DFProcess.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\signalconditioning\Filter.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\signalconditioning\FiltFilt.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\signalconditioning\Framer.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\tempotracking\DownBeat.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\tempotracking\TempoTrack.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\tempotracking\TempoTrackV2.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\tonal\ChangeDetectionFunction.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\tonal\TCSgram.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\tonal\TonalEstimator.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\transforms\DCT.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\transforms\FFT.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\dsp\wavelet\Wavelet.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\ext\cblas\include\cblas.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\ext\cblas\include\cblas_f77.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\ext\clapack\include\blaswrap.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\ext\clapack\include\clapack.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\ext\clapack\include\f2c.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\ext\kissfft\kissfft.hh" />
-    <ClInclude Include="..\..\lib\qm-dsp\ext\kissfft\kiss_fft.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\ext\kissfft\tools\kiss_fftr.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\ext\kissfft\_kiss_fft_guts.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\hmm\hmm.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\include\cblas.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\include\clapack.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\maths\Correlation.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\maths\CosineDistance.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\maths\KLDivergence.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\maths\MathAliases.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\maths\MathUtilities.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\maths\MedianFilter.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\maths\nan-inf.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\maths\pca\pca.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\maths\Polyfit.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\thread\AsynchronousTask.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\thread\BlockAllocator.h" />
-    <ClInclude Include="..\..\lib\qm-dsp\thread\Thread.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\examples\FixedTempoEstimator.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\examples\PercussionOnsetDetector.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\examples\PowerSpectrum.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\examples\SpectralCentroid.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\host\system.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\skeleton\MyPlugin.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\src\vamp-hostsdk\Files.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\src\vamp-sdk\ext\vamp_kiss_fft.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\src\vamp-sdk\ext\vamp_kiss_fftr.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\src\vamp-sdk\ext\vamp_kiss_fft_guts.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-hostsdk\host-c.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-hostsdk\hostguard.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-hostsdk\Plugin.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-hostsdk\PluginBase.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-hostsdk\PluginBufferingAdapter.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-hostsdk\PluginChannelAdapter.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-hostsdk\PluginHostAdapter.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-hostsdk\PluginInputDomainAdapter.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-hostsdk\PluginLoader.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-hostsdk\PluginSummarisingAdapter.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-hostsdk\PluginWrapper.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-hostsdk\RealTime.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-sdk\FFT.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-sdk\plugguard.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-sdk\Plugin.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-sdk\PluginAdapter.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-sdk\PluginBase.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-sdk\RealTime.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp-sdk\vamp-sdk.h" />
-    <ClInclude Include="..\..\lib\vamp-plugin-sdk\vamp\vamp.h" />
     <ClInclude Include="..\..\plugins\AdaptiveSpectrogram.h" />
     <ClInclude Include="..\..\plugins\BarBeatTrack.h" />
     <ClInclude Include="..\..\plugins\BeatTrack.h" />
@@ -320,8 +152,6 @@
     <ClInclude Include="..\..\plugins\SimilarityPlugin.h" />
     <ClInclude Include="..\..\plugins\TonalChangeDetect.h" />
     <ClInclude Include="..\..\plugins\Transcription.h" />
-    <ClInclude Include="..\linux\amd64\atlas\cmm.h" />
-    <ClInclude Include="..\mingw32\mkspecs\win32-x-g++\qplatformdefs.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">