[OMPT-svn-commit] SF.net SVN: modplug:[3732] trunk/OpenMPT

[<man...@us...>]

Revision: 3732
          http://sourceforge.net/p/modplug/code/3732
Author:   manxorist
Date:     2014-02-18 18:33:07 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
[Var] Time Stretch: Update SoundTouch to v1.8.0
[Ref] Time Stretch: Use floating point instead of integer samples for soundtouch and rename the DLL to OpenMPT_SoundTouch_f32.dll. This allows soundtouch to optionally use SSE instead of MMX internally which is way faster on modern CPUs and potentially allows for better signal-to-noise ratio in libsoundtouch's internal processing (I did not verify this). This also avoids any modification to any soundtouch source file at all.
[Mod] Time Stretch: Remove pointless m_nStretchProcessStepLength parameter. Always use a chunk size of 1024 frames now.
[Ref] Time Stretch: Rate-limit progress bar to GuiUpdateInterval (defaulting to 15ms) instead of coupling to the chunk size where GUI repainting would slow down the whole process for fast CPUs.
[Fix] Time Stretch: Fix possible buffer overflow and memleak in some corner cases.
[Mod] Time Stretch: SoundTouch does not really work great for really short samples. Before, the code used an arbitrarily chosen value of 256 frames as the limit, but this seems too low. Instead, query SoundTouch itself about the minimum required processing samples. This is not really what we want here, but gives a close enough approximation where SoundTouch starts outputting meaningful stretched data (for shorter samples, the output is mostly silence anyway).
[Mod] Time Stretch: Allow time-stretching 8bit samples without converting them to 16bit first.

Modified Paths:
--------------
    trunk/OpenMPT/build/auto/package_openmpt_win32.cmd
    trunk/OpenMPT/build/auto/package_openmpt_win64.cmd
    trunk/OpenMPT/build/gen/soundtouch.vcproj
    trunk/OpenMPT/build/gen/soundtouch.vcxproj
    trunk/OpenMPT/build/gen/soundtouch.vcxproj.filters
    trunk/OpenMPT/include/premake4.lua
    trunk/OpenMPT/include/soundtouch/COPYING.TXT
    trunk/OpenMPT/include/soundtouch/OpenMPT.txt
    trunk/OpenMPT/include/soundtouch/README.html
    trunk/OpenMPT/installer/install.iss
    trunk/OpenMPT/mptrack/Ctrl_smp.cpp
    trunk/OpenMPT/mptrack/Ctrl_smp.h
    trunk/OpenMPT/mptrack/mptrack_08.vcproj
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj
    trunk/OpenMPT/soundlib/SampleFormatConverters.h

Added Paths:
-----------
    trunk/OpenMPT/include/soundtouch/Makefile.am
    trunk/OpenMPT/include/soundtouch/bin/
    trunk/OpenMPT/include/soundtouch/bin/run_test
    trunk/OpenMPT/include/soundtouch/bin/run_test.cmd
    trunk/OpenMPT/include/soundtouch/bootstrap
    trunk/OpenMPT/include/soundtouch/config/
    trunk/OpenMPT/include/soundtouch/config/README.TXT
    trunk/OpenMPT/include/soundtouch/config/am_include.mk
    trunk/OpenMPT/include/soundtouch/config/m4/
    trunk/OpenMPT/include/soundtouch/configure-file-README.txt
    trunk/OpenMPT/include/soundtouch/configure.ac
    trunk/OpenMPT/include/soundtouch/include/
    trunk/OpenMPT/include/soundtouch/include/BPMDetect.h
    trunk/OpenMPT/include/soundtouch/include/FIFOSampleBuffer.h
    trunk/OpenMPT/include/soundtouch/include/FIFOSamplePipe.h
    trunk/OpenMPT/include/soundtouch/include/Makefile.am
    trunk/OpenMPT/include/soundtouch/include/STTypes.h
    trunk/OpenMPT/include/soundtouch/include/SoundTouch.h
    trunk/OpenMPT/include/soundtouch/lib/
    trunk/OpenMPT/include/soundtouch/make-win.bat
    trunk/OpenMPT/include/soundtouch/soundtouch-1.4.pc.in
    trunk/OpenMPT/include/soundtouch/soundtouch.m4
    trunk/OpenMPT/include/soundtouch/soundtouch.pc.in
    trunk/OpenMPT/include/soundtouch/source/
    trunk/OpenMPT/include/soundtouch/source/Android-lib/
    trunk/OpenMPT/include/soundtouch/source/Android-lib/README-SoundTouch-Android.html
    trunk/OpenMPT/include/soundtouch/source/Android-lib/jni/
    trunk/OpenMPT/include/soundtouch/source/Android-lib/jni/Android.mk
    trunk/OpenMPT/include/soundtouch/source/Android-lib/jni/Application.mk
    trunk/OpenMPT/include/soundtouch/source/Android-lib/jni/soundtouch-jni.cpp
    trunk/OpenMPT/include/soundtouch/source/Android-lib/src/
    trunk/OpenMPT/include/soundtouch/source/Android-lib/src/net/
    trunk/OpenMPT/include/soundtouch/source/Android-lib/src/net/surina/
    trunk/OpenMPT/include/soundtouch/source/Android-lib/src/net/surina/soundtouch/
    trunk/OpenMPT/include/soundtouch/source/Android-lib/src/net/surina/soundtouch/SoundTouch.java
    trunk/OpenMPT/include/soundtouch/source/Makefile.am
    trunk/OpenMPT/include/soundtouch/source/SoundStretch/
    trunk/OpenMPT/include/soundtouch/source/SoundStretch/Makefile.am
    trunk/OpenMPT/include/soundtouch/source/SoundStretch/RunParameters.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundStretch/RunParameters.h
    trunk/OpenMPT/include/soundtouch/source/SoundStretch/WavFile.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundStretch/WavFile.h
    trunk/OpenMPT/include/soundtouch/source/SoundStretch/main.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundStretch/soundstretch.dsp
    trunk/OpenMPT/include/soundtouch/source/SoundStretch/soundstretch.dsw
    trunk/OpenMPT/include/soundtouch/source/SoundStretch/soundstretch.sln
    trunk/OpenMPT/include/soundtouch/source/SoundStretch/soundstretch.vcproj
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/AAFilter.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/AAFilter.h
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/BPMDetect.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/FIRFilter.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/FIRFilter.h
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/InterpolateCubic.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/InterpolateCubic.h
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/InterpolateLinear.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/InterpolateLinear.h
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/InterpolateShannon.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/InterpolateShannon.h
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/Makefile.am
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/PeakFinder.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/PeakFinder.h
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/RateTransposer.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/RateTransposer.h
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/SoundTouch.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/SoundTouch.dsp
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/SoundTouch.dsw
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/SoundTouch.sln
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/SoundTouch.vcproj
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/TDStretch.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/TDStretch.h
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/cpu_detect.h
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/cpu_detect_x86.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/mmx_optimized.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundTouch/sse_optimized.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundTouchDLL/
    trunk/OpenMPT/include/soundtouch/source/SoundTouchDLL/SoundTouchDLL.cpp
    trunk/OpenMPT/include/soundtouch/source/SoundTouchDLL/SoundTouchDLL.h
    trunk/OpenMPT/include/soundtouch/source/SoundTouchDLL/SoundTouchDLL.pas
    trunk/OpenMPT/include/soundtouch/source/SoundTouchDLL/SoundTouchDLL.rc
    trunk/OpenMPT/include/soundtouch/source/SoundTouchDLL/SoundTouchDLL.sln
    trunk/OpenMPT/include/soundtouch/source/SoundTouchDLL/SoundTouchDLL.vcproj
    trunk/OpenMPT/include/soundtouch/source/SoundTouchDLL/resource.h

Removed Paths:
-------------
    trunk/OpenMPT/include/soundtouch/AAFilter.cpp
    trunk/OpenMPT/include/soundtouch/AAFilter.h
    trunk/OpenMPT/include/soundtouch/BPMDetect.cpp
    trunk/OpenMPT/include/soundtouch/BPMDetect.h
    trunk/OpenMPT/include/soundtouch/FIFOSampleBuffer.cpp
    trunk/OpenMPT/include/soundtouch/FIFOSampleBuffer.h
    trunk/OpenMPT/include/soundtouch/FIFOSamplePipe.h
    trunk/OpenMPT/include/soundtouch/FIRFilter.cpp
    trunk/OpenMPT/include/soundtouch/FIRFilter.h
    trunk/OpenMPT/include/soundtouch/PeakFinder.cpp
    trunk/OpenMPT/include/soundtouch/PeakFinder.h
    trunk/OpenMPT/include/soundtouch/RateTransposer.cpp
    trunk/OpenMPT/include/soundtouch/RateTransposer.h
    trunk/OpenMPT/include/soundtouch/STTypes.h
    trunk/OpenMPT/include/soundtouch/SoundTouch.cpp
    trunk/OpenMPT/include/soundtouch/SoundTouch.h
    trunk/OpenMPT/include/soundtouch/SoundTouchDLL.cpp
    trunk/OpenMPT/include/soundtouch/SoundTouchDLL.h
    trunk/OpenMPT/include/soundtouch/SoundTouchDLL.rc
    trunk/OpenMPT/include/soundtouch/TDStretch.cpp
    trunk/OpenMPT/include/soundtouch/TDStretch.h
    trunk/OpenMPT/include/soundtouch/cpu_detect.h
    trunk/OpenMPT/include/soundtouch/cpu_detect_x86_win.cpp
    trunk/OpenMPT/include/soundtouch/mmx_optimized.cpp
    trunk/OpenMPT/include/soundtouch/resource.h
    trunk/OpenMPT/include/soundtouch/sse_optimized.cpp

Modified: trunk/OpenMPT/build/auto/package_openmpt_win32.cmd
===================================================================
--- trunk/OpenMPT/build/auto/package_openmpt_win32.cmd	2014-02-18 18:24:10 UTC (rev 3731)
+++ trunk/OpenMPT/build/auto/package_openmpt_win32.cmd	2014-02-18 18:33:07 UTC (rev 3732)
@@ -9,7 +9,7 @@
 del /f /q openmpt-win32.tar
 del /f /q openmpt-win32-r%GOT_REVISION%.7z
 copy /y ..\..\LICENSE .\ || goto error
-"C:\Program Files\7-Zip\7z.exe" a -t7z -mx=9 openmpt-win32-r%GOT_REVISION%.7z mptrack.exe OpenMPT_SoundTouch_i16.dll "MIDI Input Output.dll" LICENSE || goto error
+"C:\Program Files\7-Zip\7z.exe" a -t7z -mx=9 openmpt-win32-r%GOT_REVISION%.7z mptrack.exe OpenMPT_SoundTouch_f32.dll "MIDI Input Output.dll" LICENSE || goto error
 "C:\Program Files\7-Zip\7z.exe" a -ttar openmpt-win32.tar openmpt-win32-r%GOT_REVISION%.7z || goto error
 del /f /q openmpt-win32-r%GOT_REVISION%.7z
 cd ..\.. || goto error

Modified: trunk/OpenMPT/build/auto/package_openmpt_win64.cmd
===================================================================
--- trunk/OpenMPT/build/auto/package_openmpt_win64.cmd	2014-02-18 18:24:10 UTC (rev 3731)
+++ trunk/OpenMPT/build/auto/package_openmpt_win64.cmd	2014-02-18 18:33:07 UTC (rev 3732)
@@ -9,7 +9,7 @@
 del /f /q openmpt-win64.tar
 del /f /q openmpt-win64-r%GOT_REVISION%.7z
 copy /y ..\..\LICENSE .\ || goto error
-"C:\Program Files\7-Zip\7z.exe" a -t7z -mx=9 openmpt-win64-r%GOT_REVISION%.7z mptrack.exe OpenMPT_SoundTouch_i16.dll "MIDI Input Output.dll" LICENSE || goto error
+"C:\Program Files\7-Zip\7z.exe" a -t7z -mx=9 openmpt-win64-r%GOT_REVISION%.7z mptrack.exe OpenMPT_SoundTouch_f32.dll "MIDI Input Output.dll" LICENSE || goto error
 "C:\Program Files\7-Zip\7z.exe" a -ttar openmpt-win64.tar openmpt-win64-r%GOT_REVISION%.7z || goto error
 del /f /q openmpt-win64-r%GOT_REVISION%.7z
 cd ..\.. || goto error

Modified: trunk/OpenMPT/build/gen/soundtouch.vcproj
===================================================================
--- trunk/OpenMPT/build/gen/soundtouch.vcproj	2014-02-18 18:24:10 UTC (rev 3731)
+++ trunk/OpenMPT/build/gen/soundtouch.vcproj	2014-02-18 18:33:07 UTC (rev 3732)
@@ -43,14 +43,15 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\include\soundtouch\include"
+				PreprocessorDefinitions="DLL_EXPORTS;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_i16.pdb"
+				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_f32.pdb"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -58,20 +59,21 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				PreprocessorDefinitions="DLL_EXPORTS;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\include\soundtouch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\OpenMPT_SoundTouch_i16.dll"
+				OutputFile="$(OutDir)\OpenMPT_SoundTouch_f32.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_i16.pdb"
+				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_f32.pdb"
 				SubSystem="2"
-				ImportLibrary="..\..\bin\Win32-Debug\OpenMPT_SoundTouch_i16.lib"
+				ImportLibrary="..\..\bin\Win32-Debug\OpenMPT_SoundTouch_f32.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -125,14 +127,15 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\include\soundtouch\include"
+				PreprocessorDefinitions="DLL_EXPORTS;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_i16.pdb"
+				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_f32.pdb"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -140,20 +143,21 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				PreprocessorDefinitions="DLL_EXPORTS;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\include\soundtouch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\OpenMPT_SoundTouch_i16.dll"
+				OutputFile="$(OutDir)\OpenMPT_SoundTouch_f32.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_i16.pdb"
+				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_f32.pdb"
 				SubSystem="2"
-				ImportLibrary="..\..\bin\x64-Debug\OpenMPT_SoundTouch_i16.lib"
+				ImportLibrary="..\..\bin\x64-Debug\OpenMPT_SoundTouch_f32.lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -207,14 +211,15 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="3"
-				PreprocessorDefinitions="DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\include\soundtouch\include"
+				PreprocessorDefinitions="DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_i16.pdb"
+				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_f32.pdb"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -222,22 +227,23 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				PreprocessorDefinitions="DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\include\soundtouch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\OpenMPT_SoundTouch_i16.dll"
+				OutputFile="$(OutDir)\OpenMPT_SoundTouch_f32.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_i16.pdb"
+				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_f32.pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\bin\Win32\OpenMPT_SoundTouch_i16.lib"
+				ImportLibrary="..\..\bin\Win32\OpenMPT_SoundTouch_f32.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -292,14 +298,15 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="3"
-				PreprocessorDefinitions="DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\include\soundtouch\include"
+				PreprocessorDefinitions="DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_i16.pdb"
+				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_f32.pdb"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -307,22 +314,23 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				PreprocessorDefinitions="DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\include\soundtouch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\OpenMPT_SoundTouch_i16.dll"
+				OutputFile="$(OutDir)\OpenMPT_SoundTouch_f32.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_i16.pdb"
+				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_f32.pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\bin\x64\OpenMPT_SoundTouch_i16.lib"
+				ImportLibrary="..\..\bin\x64\OpenMPT_SoundTouch_f32.lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -376,14 +384,15 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/GL- /MP"
 				Optimization="3"
-				PreprocessorDefinitions="DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\include\soundtouch\include"
+				PreprocessorDefinitions="DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_i16.pdb"
+				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_f32.pdb"
 				DebugInformationFormat="0"
 			/>
 			<Tool
@@ -391,21 +400,22 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				PreprocessorDefinitions="DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\include\soundtouch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\OpenMPT_SoundTouch_i16.dll"
+				OutputFile="$(OutDir)\OpenMPT_SoundTouch_f32.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="false"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\bin\Win32\OpenMPT_SoundTouch_i16.lib"
+				ImportLibrary="..\..\bin\Win32\OpenMPT_SoundTouch_f32.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -460,14 +470,15 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/GL- /MP"
 				Optimization="3"
-				PreprocessorDefinitions="DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\include\soundtouch\include"
+				PreprocessorDefinitions="DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_i16.pdb"
+				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_f32.pdb"
 				DebugInformationFormat="0"
 			/>
 			<Tool
@@ -475,21 +486,22 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				PreprocessorDefinitions="DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\include\soundtouch\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\OpenMPT_SoundTouch_i16.dll"
+				OutputFile="$(OutDir)\OpenMPT_SoundTouch_f32.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="false"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="..\..\bin\x64\OpenMPT_SoundTouch_i16.lib"
+				ImportLibrary="..\..\bin\x64\OpenMPT_SoundTouch_f32.lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -529,102 +541,146 @@
 				Name="soundtouch"
 				Filter=""
 				>
-				<File
-					RelativePath="..\..\include\soundtouch\AAFilter.cpp"
+				<Filter
+					Name="include"
+					Filter=""
 					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\BPMDetect.cpp"
+					<File
+						RelativePath="..\..\include\soundtouch\include\BPMDetect.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\include\soundtouch\include\FIFOSampleBuffer.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\include\soundtouch\include\FIFOSamplePipe.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\include\soundtouch\include\SoundTouch.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\include\soundtouch\include\STTypes.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="source"
+					Filter=""
 					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\cpu_detect_x86_win.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\FIFOSampleBuffer.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\FIRFilter.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\mmx_optimized.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\PeakFinder.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\RateTransposer.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\SoundTouch.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\SoundTouchDLL.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\sse_optimized.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\TDStretch.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\AAFilter.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\BPMDetect.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\cpu_detect.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\FIFOSampleBuffer.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\FIFOSamplePipe.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\FIRFilter.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\PeakFinder.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\RateTransposer.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\SoundTouch.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\SoundTouchDLL.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\STTypes.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\soundtouch\TDStretch.h"
-					>
-				</File>
+					<Filter
+						Name="SoundTouch"
+						Filter=""
+						>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\AAFilter.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\BPMDetect.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\cpu_detect_x86.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\FIFOSampleBuffer.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\FIRFilter.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\InterpolateCubic.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\InterpolateLinear.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\InterpolateShannon.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\mmx_optimized.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\PeakFinder.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\RateTransposer.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\SoundTouch.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\sse_optimized.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\TDStretch.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\AAFilter.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\cpu_detect.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\FIRFilter.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\InterpolateCubic.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\InterpolateLinear.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\InterpolateShannon.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\PeakFinder.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\RateTransposer.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouch\TDStretch.h"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="SoundTouchDLL"
+						Filter=""
+						>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouchDLL\SoundTouchDLL.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\include\soundtouch\source\SoundTouchDLL\SoundTouchDLL.h"
+							>
+						</File>
+					</Filter>
+				</Filter>
 			</Filter>
 		</Filter>
 	</Files>

Modified: trunk/OpenMPT/build/gen/soundtouch.vcxproj
===================================================================
--- trunk/OpenMPT/build/gen/soundtouch.vcxproj	2014-02-18 18:24:10 UTC (rev 3731)
+++ trunk/OpenMPT/build/gen/soundtouch.vcxproj	2014-02-18 18:33:07 UTC (rev 3732)
@@ -92,39 +92,40 @@
 		<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\Win32-Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\soundtouch\x32\Debug\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">OpenMPT_SoundTouch_i16</TargetName>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">OpenMPT_SoundTouch_f32</TargetName>
 		<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</IgnoreImportLibrary>
 		<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\x64-Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\obj\soundtouch\x64\Debug\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">OpenMPT_SoundTouch_i16</TargetName>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">OpenMPT_SoundTouch_f32</TargetName>
 		<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</IgnoreImportLibrary>
 		<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\Win32\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\soundtouch\x32\Release\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">OpenMPT_SoundTouch_i16</TargetName>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">OpenMPT_SoundTouch_f32</TargetName>
 		<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</IgnoreImportLibrary>
 		<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\x64\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\obj\soundtouch\x64\Release\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">OpenMPT_SoundTouch_i16</TargetName>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">OpenMPT_SoundTouch_f32</TargetName>
 		<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</IgnoreImportLibrary>
 		<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\..\bin\Win32\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\obj\soundtouch\x32\ReleaseNoLTCG\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">OpenMPT_SoundTouch_i16</TargetName>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">OpenMPT_SoundTouch_f32</TargetName>
 		<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">false</IgnoreImportLibrary>
 		<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">false</LinkIncremental>
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\..\bin\x64\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\obj\soundtouch\x64\ReleaseNoLTCG\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">OpenMPT_SoundTouch_i16</TargetName>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">OpenMPT_SoundTouch_f32</TargetName>
 		<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">false</IgnoreImportLibrary>
 		<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">false</LinkIncremental>
 	</PropertyGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 		<ClCompile>
 			<Optimization>Disabled</Optimization>
-			<PreprocessorDefinitions>DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\..\include\soundtouch\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>DLL_EXPORTS;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>true</MinimalRebuild>
 			<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 			<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -134,22 +135,24 @@
 			<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 		</ClCompile>
 		<ResourceCompile>
-			<PreprocessorDefinitions>DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>DLL_EXPORTS;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\..\include\soundtouch\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 		<Link>
-			<OutputFile>$(OutDir)OpenMPT_SoundTouch_i16.dll</OutputFile>
+			<OutputFile>$(OutDir)OpenMPT_SoundTouch_f32.dll</OutputFile>
 			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
-			<ProgramDataBaseFileName>$(OutDir)OpenMPT_SoundTouch_i16.pdb</ProgramDataBaseFileName>
-			<ImportLibrary>..\..\bin\Win32-Debug\OpenMPT_SoundTouch_i16.lib</ImportLibrary>
+			<ProgramDataBaseFileName>$(OutDir)OpenMPT_SoundTouch_f32.pdb</ProgramDataBaseFileName>
+			<ImportLibrary>..\..\bin\Win32-Debug\OpenMPT_SoundTouch_f32.lib</ImportLibrary>
 			<TargetMachine>MachineX86</TargetMachine>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 		<ClCompile>
 			<Optimization>Disabled</Optimization>
-			<PreprocessorDefinitions>DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\..\include\soundtouch\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>DLL_EXPORTS;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>true</MinimalRebuild>
 			<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 			<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -159,15 +162,16 @@
 			<DebugInformationFormat>OldStyle</DebugInformationFormat>
 		</ClCompile>
 		<ResourceCompile>
-			<PreprocessorDefinitions>DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>DLL_EXPORTS;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\..\include\soundtouch\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 		<Link>
-			<OutputFile>$(OutDir)OpenMPT_SoundTouch_i16.dll</OutputFile>
+			<OutputFile>$(OutDir)OpenMPT_SoundTouch_f32.dll</OutputFile>
 			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
-			<ProgramDataBaseFileName>$(OutDir)OpenMPT_SoundTouch_i16.pdb</ProgramDataBaseFileName>
-			<ImportLibrary>..\..\bin\x64-Debug\OpenMPT_SoundTouch_i16.lib</ImportLibrary>
+			<ProgramDataBaseFileName>$(OutDir)OpenMPT_SoundTouch_f32.pdb</ProgramDataBaseFileName>
+			<ImportLibrary>..\..\bin\x64-Debug\OpenMPT_SoundTouch_f32.lib</ImportLibrary>
 			<TargetMachine>MachineX64</TargetMachine>
 		</Link>
 	</ItemDefinitionGroup>
@@ -175,7 +179,8 @@
 		<ClCompile>
 			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
-			<PreprocessorDefinitions>DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\..\include\soundtouch\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>false</MinimalRebuild>
 			<StringPooling>true</StringPooling>
 			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -186,17 +191,18 @@
 			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 		</ClCompile>
 		<ResourceCompile>
-			<PreprocessorDefinitions>DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\..\include\soundtouch\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 		<Link>
-			<OutputFile>$(OutDir)OpenMPT_SoundTouch_i16.dll</OutputFile>
+			<OutputFile>$(OutDir)OpenMPT_SoundTouch_f32.dll</OutputFile>
 			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)OpenMPT_SoundTouch_i16.pdb</ProgramDataBaseFileName>
-			<ImportLibrary>..\..\bin\Win32\OpenMPT_SoundTouch_i16.lib</ImportLibrary>
+			<ProgramDataBaseFileName>$(OutDir)OpenMPT_SoundTouch_f32.pdb</ProgramDataBaseFileName>
+			<ImportLibrary>..\..\bin\Win32\OpenMPT_SoundTouch_f32.lib</ImportLibrary>
 			<TargetMachine>MachineX86</TargetMachine>
 		</Link>
 	</ItemDefinitionGroup>
@@ -204,7 +210,8 @@
 		<ClCompile>
 			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
-			<PreprocessorDefinitions>DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\..\include\soundtouch\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>false</MinimalRebuild>
 			<StringPooling>true</StringPooling>
 			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -215,17 +222,18 @@
 			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 		</ClCompile>
 		<ResourceCompile>
-			<PreprocessorDefinitions>DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\..\include\soundtouch\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 		<Link>
-			<OutputFile>$(OutDir)OpenMPT_SoundTouch_i16.dll</OutputFile>
+			<OutputFile>$(OutDir)OpenMPT_SoundTouch_f32.dll</OutputFile>
 			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)OpenMPT_SoundTouch_i16.pdb</ProgramDataBaseFileName>
-			<ImportLibrary>..\..\bin\x64\OpenMPT_SoundTouch_i16.lib</ImportLibrary>
+			<ProgramDataBaseFileName>$(OutDir)OpenMPT_SoundTouch_f32.pdb</ProgramDataBaseFileName>
+			<ImportLibrary>..\..\bin\x64\OpenMPT_SoundTouch_f32.lib</ImportLibrary>
 			<TargetMachine>MachineX64</TargetMachine>
 		</Link>
 	</ItemDefinitionGroup>
@@ -233,7 +241,8 @@
 		<ClCompile>
 			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
-			<PreprocessorDefinitions>DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\..\include\soundtouch\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>false</MinimalRebuild>
 			<StringPooling>true</StringPooling>
 			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -244,16 +253,17 @@
 			<DebugInformationFormat></DebugInformationFormat>
 		</ClCompile>
 		<ResourceCompile>
-			<PreprocessorDefinitions>DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\..\include\soundtouch\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 		<Link>
-			<OutputFile>$(OutDir)OpenMPT_SoundTouch_i16.dll</OutputFile>
+			<OutputFile>$(OutDir)OpenMPT_SoundTouch_f32.dll</OutputFile>
 			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ImportLibrary>..\..\bin\Win32\OpenMPT_SoundTouch_i16.lib</ImportLibrary>
+			<ImportLibrary>..\..\bin\Win32\OpenMPT_SoundTouch_f32.lib</ImportLibrary>
 			<TargetMachine>MachineX86</TargetMachine>
 		</Link>
 	</ItemDefinitionGroup>
@@ -261,7 +271,8 @@
 		<ClCompile>
 			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
-			<PreprocessorDefinitions>DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\..\include\soundtouch\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>false</MinimalRebuild>
 			<StringPooling>true</StringPooling>
 			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -272,58 +283,68 @@
 			<DebugInformationFormat></DebugInformationFormat>
 		</ClCompile>
 		<ResourceCompile>
-			<PreprocessorDefinitions>DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>DLL_EXPORTS;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\..\include\soundtouch\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 		<Link>
-			<OutputFile>$(OutDir)OpenMPT_SoundTouch_i16.dll</OutputFile>
+			<OutputFile>$(OutDir)OpenMPT_SoundTouch_f32.dll</OutputFile>
 			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ImportLibrary>..\..\bin\x64\OpenMPT_SoundTouch_i16.lib</ImportLibrary>
+			<ImportLibrary>..\..\bin\x64\OpenMPT_SoundTouch_f32.lib</ImportLibrary>
 			<TargetMachine>MachineX64</TargetMachine>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>
-		<ClInclude Include="..\..\include\soundtouch\AAFilter.h" />
-		<ClInclude Include="..\..\include\soundtouch\BPMDetect.h" />
-		<ClInclude Include="..\..\include\soundtouch\cpu_detect.h" />
-		<ClInclude Include="..\..\include\soundtouch\FIFOSampleBuffer.h" />
-		<ClInclude Include="..\..\include\soundtouch\FIFOSamplePipe.h" />
-		<ClInclude Include="..\..\include\soundtouch\FIRFilter.h" />
-		<ClInclude Include="..\..\include\soundtouch\PeakFinder.h" />
-		<ClInclude Include="..\..\include\soundtouch\RateTransposer.h" />
-		<ClInclude Include="..\..\include\soundtouch\SoundTouch.h" />
-		<ClInclude Include="..\..\include\soundtouch\SoundTouchDLL.h" />
-		<ClInclude Include="..\..\include\soundtouch\STTypes.h" />
-		<ClInclude Include="..\..\include\soundtouch\TDStretch.h" />
+		<ClInclude Include="..\..\include\soundtouch\include\BPMDetect.h" />
+		<ClInclude Include="..\..\include\soundtouch\include\FIFOSampleBuffer.h" />
+		<ClInclude Include="..\..\include\soundtouch\include\FIFOSamplePipe.h" />
+		<ClInclude Include="..\..\include\soundtouch\include\SoundTouch.h" />
+		<ClInclude Include="..\..\include\soundtouch\include\STTypes.h" />
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\AAFilter.h" />
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\cpu_detect.h" />
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\FIRFilter.h" />
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\InterpolateCubic.h" />
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\InterpolateLinear.h" />
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\InterpolateShannon.h" />
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\PeakFinder.h" />
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\RateTransposer.h" />
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\TDStretch.h" />
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouchDLL\SoundTouchDLL.h" />
 	</ItemGroup>
 	<ItemGroup>
-		<ClCompile Include="..\..\include\soundtouch\AAFilter.cpp">
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\AAFilter.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\BPMDetect.cpp">
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\BPMDetect.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\cpu_detect_x86_win.cpp">
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\cpu_detect_x86.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\FIFOSampleBuffer.cpp">
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\FIFOSampleBuffer.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\FIRFilter.cpp">
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\FIRFilter.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\mmx_optimized.cpp">
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\InterpolateCubic.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\PeakFinder.cpp">
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\InterpolateLinear.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\RateTransposer.cpp">
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\InterpolateShannon.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\SoundTouch.cpp">
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\mmx_optimized.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\SoundTouchDLL.cpp">
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\PeakFinder.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\sse_optimized.cpp">
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\RateTransposer.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\TDStretch.cpp">
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\SoundTouch.cpp">
 		</ClCompile>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\sse_optimized.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\TDStretch.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouchDLL\SoundTouchDLL.cpp">
+		</ClCompile>
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 	<ImportGroup Label="ExtensionTargets">

Modified: trunk/OpenMPT/build/gen/soundtouch.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/gen/soundtouch.vcxproj.filters	2014-02-18 18:24:10 UTC (rev 3731)
+++ trunk/OpenMPT/build/gen/soundtouch.vcxproj.filters	2014-02-18 18:33:07 UTC (rev 3732)
@@ -2,86 +2,116 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{F54B9B70-BA56-594A-9347-689ABAFC85B4}</UniqueIdentifier>
+			<UniqueIdentifier>{EC94FF61-92CE-D540-8483-022259E6CC22}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\soundtouch">
-			<UniqueIdentifier>{5F68B75A-F80A-FD42-A74F-8F1E3F02F8C2}</UniqueIdentifier>
+			<UniqueIdentifier>{096855C4-7196-DE47-93F1-9CAA87B3A2EA}</UniqueIdentifier>
 		</Filter>
+		<Filter Include="include\soundtouch\include">
+			<UniqueIdentifier>{5BD4D5F4-7413-FF4E-B177-2528F918972D}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="include\soundtouch\source">
+			<UniqueIdentifier>{252F8EF8-C266-744C-949A-480BF85F38F8}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="include\soundtouch\source\SoundTouch">
+			<UniqueIdentifier>{AAD5A647-EBAD-BB42-9365-B9052B18971F}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="include\soundtouch\source\SoundTouchDLL">
+			<UniqueIdentifier>{DD1934CE-E4B6-D54A-8C92-B014F31BD7CD}</UniqueIdentifier>
+		</Filter>
 	</ItemGroup>
 	<ItemGroup>
-		<ClInclude Include="..\..\include\soundtouch\AAFilter.h">
-			<Filter>include\soundtouch</Filter>
+		<ClInclude Include="..\..\include\soundtouch\include\BPMDetect.h">
+			<Filter>include\soundtouch\include</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\include\soundtouch\BPMDetect.h">
-			<Filter>include\soundtouch</Filter>
+		<ClInclude Include="..\..\include\soundtouch\include\FIFOSampleBuffer.h">
+			<Filter>include\soundtouch\include</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\include\soundtouch\cpu_detect.h">
-			<Filter>include\soundtouch</Filter>
+		<ClInclude Include="..\..\include\soundtouch\include\FIFOSamplePipe.h">
+			<Filter>include\soundtouch\include</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\include\soundtouch\FIFOSampleBuffer.h">
-			<Filter>include\soundtouch</Filter>
+		<ClInclude Include="..\..\include\soundtouch\include\SoundTouch.h">
+			<Filter>include\soundtouch\include</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\include\soundtouch\FIFOSamplePipe.h">
-			<Filter>include\soundtouch</Filter>
+		<ClInclude Include="..\..\include\soundtouch\include\STTypes.h">
+			<Filter>include\soundtouch\include</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\include\soundtouch\FIRFilter.h">
-			<Filter>include\soundtouch</Filter>
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\AAFilter.h">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\include\soundtouch\PeakFinder.h">
-			<Filter>include\soundtouch</Filter>
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\cpu_detect.h">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\include\soundtouch\RateTransposer.h">
-			<Filter>include\soundtouch</Filter>
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\FIRFilter.h">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\include\soundtouch\SoundTouch.h">
-			<Filter>include\soundtouch</Filter>
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\InterpolateCubic.h">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\include\soundtouch\SoundTouchDLL.h">
-			<Filter>include\soundtouch</Filter>
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\InterpolateLinear.h">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\include\soundtouch\STTypes.h">
-			<Filter>include\soundtouch</Filter>
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\InterpolateShannon.h">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\include\soundtouch\TDStretch.h">
-			<Filter>include\soundtouch</Filter>
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\PeakFinder.h">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClInclude>
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\RateTransposer.h">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouch\TDStretch.h">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\include\soundtouch\source\SoundTouchDLL\SoundTouchDLL.h">
+			<Filter>include\soundtouch\source\SoundTouchDLL</Filter>
+		</ClInclude>
 	</ItemGroup>
 	<ItemGroup>
-		<ClCompile Include="..\..\include\soundtouch\AAFilter.cpp">
-			<Filter>include\soundtouch</Filter>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\AAFilter.cpp">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\BPMDetect.cpp">
-			<Filter>include\soundtouch</Filter>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\BPMDetect.cpp">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\cpu_detect_x86_win.cpp">
-			<Filter>include\soundtouch</Filter>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\cpu_detect_x86.cpp">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\FIFOSampleBuffer.cpp">
-			<Filter>include\soundtouch</Filter>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\FIFOSampleBuffer.cpp">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\FIRFilter.cpp">
-			<Filter>include\soundtouch</Filter>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\FIRFilter.cpp">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\mmx_optimized.cpp">
-			<Filter>include\soundtouch</Filter>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\InterpolateCubic.cpp">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\PeakFinder.cpp">
-			<Filter>include\soundtouch</Filter>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\InterpolateLinear.cpp">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\RateTransposer.cpp">
-			<Filter>include\soundtouch</Filter>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\InterpolateShannon.cpp">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\SoundTouch.cpp">
-			<Filter>include\soundtouch</Filter>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\mmx_optimized.cpp">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\SoundTouchDLL.cpp">
-			<Filter>include\soundtouch</Filter>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\PeakFinder.cpp">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\sse_optimized.cpp">
-			<Filter>include\soundtouch</Filter>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\RateTransposer.cpp">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\include\soundtouch\TDStretch.cpp">
-			<Filter>include\soundtouch</Filter>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\SoundTouch.cpp">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
 		</ClCompile>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\sse_optimized.cpp">
+			<Filter>include\soundtouch\source\SoundTouch</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\include\soundtouch\source\SoundTouch\TDStretch.cpp">
+			<Filter>include\soundtouch\source\SoundTouch</Filt...
 
[truncated message content]