commit 6534b32a1c3ff7c2de5f7799ed180951310a4de7
parent 1f3585c594dcac5dc7176f5003cb4ae4d79cd058
Author: Steven Atkinson <steven@atkinson.mn>
Date: Sun, 1 Oct 2023 15:14:33 -0700
Move dependency on general audio DSP tools from `NeuralAmpModelerCore` to `AudioDSPTools` (#374)
* Add AudioDSPTools
* Update NeuralAmpModelerCore
Update to version without dsp/
Use AudioDSPTools instead.
* Move location of AudioDSPTools to be like core
* Undo
* Move location of AudioDSPTools submodule
* Change location of Core/dsp to AudioDSPTools/dsp for VS solution
* Update locations for AudioDSPTools in VS solution projects
Diffstat:
11 files changed, 161 insertions(+), 166 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
[submodule "NeuralAmpModeler/NeuralAmpModelerCore"]
path = NeuralAmpModeler/NeuralAmpModelerCore
url = https://github.com/sdatkinson/NeuralAmpModelerCore.git
+[submodule "AudioDSPTools"]
+ path = NeuralAmpModeler/AudioDSPTools
+ url = https://github.com/sdatkinson/AudioDSPTools.git
diff --git a/NeuralAmpModeler/AudioDSPTools b/NeuralAmpModeler/AudioDSPTools
@@ -0,0 +1 @@
+Subproject commit 37f73d9ea6698b1b56c5a54fbdfa453a84fbd0b9
diff --git a/NeuralAmpModeler/NeuralAmpModeler.h b/NeuralAmpModeler/NeuralAmpModeler.h
@@ -1,11 +1,11 @@
#pragma once
#include "NeuralAmpModelerCore/NAM/dsp.h"
-#include "NeuralAmpModelerCore/dsp/ImpulseResponse.h"
-#include "NeuralAmpModelerCore/dsp/NoiseGate.h"
-#include "NeuralAmpModelerCore/dsp/RecursiveLinearFilter.h"
-#include "NeuralAmpModelerCore/dsp/dsp.h"
-#include "NeuralAmpModelerCore/dsp/wav.h"
+#include "AudioDSPTools/dsp/ImpulseResponse.h"
+#include "AudioDSPTools/dsp/NoiseGate.h"
+#include "AudioDSPTools/dsp/RecursiveLinearFilter.h"
+#include "AudioDSPTools/dsp/dsp.h"
+#include "AudioDSPTools/dsp/wav.h"
#include "IPlug_include_in_plug_hdr.h"
#include "ISender.h"
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj
@@ -409,19 +409,12 @@
<ClCompile Include="..\..\iPlug2\IPlug\IPlugPluginBase.cpp" />
<ClCompile Include="..\..\iPlug2\IPlug\IPlugProcessor.cpp" />
<ClCompile Include="..\..\iPlug2\IPlug\IPlugTimer.cpp" />
+ <ClCompile Include="..\AudioDSPTools\dsp\dsp.cpp" />
+ <ClCompile Include="..\AudioDSPTools\dsp\ImpulseResponse.cpp" />
+ <ClCompile Include="..\AudioDSPTools\dsp\NoiseGate.cpp" />
+ <ClCompile Include="..\AudioDSPTools\dsp\RecursiveLinearFilter.cpp" />
+ <ClCompile Include="..\AudioDSPTools\dsp\wav.cpp" />
<ClCompile Include="..\NeuralAmpModeler.cpp" />
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\dsp.cpp">
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(RelativeDir)</ObjectFileName>
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Tracer|Win32'">$(IntDir)%(RelativeDir)</ObjectFileName>
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(RelativeDir)</ObjectFileName>
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(RelativeDir)</ObjectFileName>
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Tracer|x64'">$(IntDir)%(RelativeDir)</ObjectFileName>
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(RelativeDir)</ObjectFileName>
- </ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\ImpulseResponse.cpp" />
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\NoiseGate.cpp" />
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\RecursiveLinearFilter.cpp" />
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\wav.cpp" />
<ClCompile Include="..\NeuralAmpModelerCore\NAM\activations.cpp" />
<ClCompile Include="..\NeuralAmpModelerCore\NAM\convnet.cpp" />
<ClCompile Include="..\NeuralAmpModelerCore\NAM\dsp.cpp">
@@ -515,16 +508,17 @@
<ClInclude Include="..\..\iPlug2\IPlug\IPlugUtilities.h" />
<ClInclude Include="..\..\iPlug2\IPlug\IPlug_include_in_plug_hdr.h" />
<ClInclude Include="..\..\iPlug2\IPlug\IPlug_include_in_plug_src.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\dsp.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\ImpulseResponse.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\NoiseGate.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\RecursiveLinearFilter.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\Resample.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\version.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\wav.h" />
<ClInclude Include="..\Colors.h" />
<ClInclude Include="..\config.h" />
<ClInclude Include="..\NeuralAmpModeler.h" />
<ClInclude Include="..\NeuralAmpModelerControls.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\dsp.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\ImpulseResponse.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\NoiseGate.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\RecursiveLinearFilter.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\Resample.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\wav.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\activations.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\convnet.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\dsp.h" />
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj.filters b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj.filters
@@ -58,21 +58,6 @@
<ClCompile Include="..\..\iPlug2\IGraphics\Drawing\IGraphicsSkia.cpp">
<Filter>IGraphics\Drawing</Filter>
</ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\dsp.cpp">
- <Filter>dsp</Filter>
- </ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\ImpulseResponse.cpp">
- <Filter>dsp</Filter>
- </ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\NoiseGate.cpp">
- <Filter>dsp</Filter>
- </ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\RecursiveLinearFilter.cpp">
- <Filter>dsp</Filter>
- </ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\wav.cpp">
- <Filter>dsp</Filter>
- </ClCompile>
<ClCompile Include="..\NeuralAmpModeler.cpp" />
<ClCompile Include="..\NeuralAmpModelerCore\NAM\convnet.cpp">
<Filter>NAM</Filter>
@@ -95,6 +80,21 @@
<ClCompile Include="..\NeuralAmpModelerCore\NAM\activations.cpp">
<Filter>NAM</Filter>
</ClCompile>
+ <ClCompile Include="..\AudioDSPTools\dsp\dsp.cpp">
+ <Filter>dsp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\AudioDSPTools\dsp\ImpulseResponse.cpp">
+ <Filter>dsp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\AudioDSPTools\dsp\NoiseGate.cpp">
+ <Filter>dsp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\AudioDSPTools\dsp\RecursiveLinearFilter.cpp">
+ <Filter>dsp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\AudioDSPTools\dsp\wav.cpp">
+ <Filter>dsp</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\resources\resource.h">
@@ -244,24 +244,6 @@
<ClInclude Include="..\..\iPlug2\IGraphics\Drawing\IGraphicsSkia.h">
<Filter>IGraphics\Drawing</Filter>
</ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\dsp.h">
- <Filter>dsp</Filter>
- </ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\ImpulseResponse.h">
- <Filter>dsp</Filter>
- </ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\NoiseGate.h">
- <Filter>dsp</Filter>
- </ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\RecursiveLinearFilter.h">
- <Filter>dsp</Filter>
- </ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\Resample.h">
- <Filter>dsp</Filter>
- </ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\wav.h">
- <Filter>dsp</Filter>
- </ClInclude>
<ClInclude Include="..\Colors.h" />
<ClInclude Include="..\config.h" />
<ClInclude Include="..\NeuralAmpModeler.h" />
@@ -287,6 +269,27 @@
<Filter>NAM</Filter>
</ClInclude>
<ClInclude Include="..\NeuralAmpModelerControls.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\dsp.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\ImpulseResponse.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\NoiseGate.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\RecursiveLinearFilter.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\Resample.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\version.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\wav.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="resources">
@@ -313,12 +316,12 @@
<Filter Include="IGraphics\Controls">
<UniqueIdentifier>{3c740de7-2371-4065-bf3d-5af9193c7b7d}</UniqueIdentifier>
</Filter>
- <Filter Include="dsp">
- <UniqueIdentifier>{6a256439-d389-4777-8f93-a14fe677139f}</UniqueIdentifier>
- </Filter>
<Filter Include="NAM">
<UniqueIdentifier>{eeb1d689-b2e9-48ff-b191-358821a60f70}</UniqueIdentifier>
</Filter>
+ <Filter Include="dsp">
+ <UniqueIdentifier>{29388c48-c6f4-4b62-9284-b09d44ad1e40}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\resources\main.rc">
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj
@@ -317,15 +317,16 @@
<ClInclude Include="..\..\iPlug2\IPlug\IPlugUtilities.h" />
<ClInclude Include="..\..\iPlug2\IPlug\IPlug_include_in_plug_hdr.h" />
<ClInclude Include="..\..\iPlug2\IPlug\IPlug_include_in_plug_src.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\dsp.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\ImpulseResponse.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\NoiseGate.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\RecursiveLinearFilter.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\Resample.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\version.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\wav.h" />
<ClInclude Include="..\Colors.h" />
<ClInclude Include="..\NeuralAmpModeler.h" />
<ClInclude Include="..\NeuralAmpModelerControls.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\dsp.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\ImpulseResponse.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\NoiseGate.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\RecursiveLinearFilter.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\Resample.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\wav.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\activations.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\convnet.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\dsp.h" />
@@ -375,19 +376,12 @@
<ClCompile Include="..\..\iPlug2\IPlug\IPlugPluginBase.cpp" />
<ClCompile Include="..\..\iPlug2\IPlug\IPlugProcessor.cpp" />
<ClCompile Include="..\..\iPlug2\IPlug\IPlugTimer.cpp" />
+ <ClCompile Include="..\AudioDSPTools\dsp\dsp.cpp" />
+ <ClCompile Include="..\AudioDSPTools\dsp\ImpulseResponse.cpp" />
+ <ClCompile Include="..\AudioDSPTools\dsp\NoiseGate.cpp" />
+ <ClCompile Include="..\AudioDSPTools\dsp\RecursiveLinearFilter.cpp" />
+ <ClCompile Include="..\AudioDSPTools\dsp\wav.cpp" />
<ClCompile Include="..\NeuralAmpModeler.cpp" />
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\dsp.cpp">
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(RelativeDir)</ObjectFileName>
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Tracer|Win32'">$(IntDir)%(RelativeDir)</ObjectFileName>
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(RelativeDir)</ObjectFileName>
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(RelativeDir)</ObjectFileName>
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Tracer|x64'">$(IntDir)%(RelativeDir)</ObjectFileName>
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(RelativeDir)</ObjectFileName>
- </ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\ImpulseResponse.cpp" />
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\NoiseGate.cpp" />
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\RecursiveLinearFilter.cpp" />
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\wav.cpp" />
<ClCompile Include="..\NeuralAmpModelerCore\NAM\activations.cpp" />
<ClCompile Include="..\NeuralAmpModelerCore\NAM\convnet.cpp" />
<ClCompile Include="..\NeuralAmpModelerCore\NAM\dsp.cpp">
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj.filters b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj.filters
@@ -77,21 +77,6 @@
<ClCompile Include="..\..\iPlug2\IGraphics\Drawing\IGraphicsSkia.cpp">
<Filter>IGraphics\Drawing</Filter>
</ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\dsp.cpp">
- <Filter>dsp</Filter>
- </ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\ImpulseResponse.cpp">
- <Filter>dsp</Filter>
- </ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\NoiseGate.cpp">
- <Filter>dsp</Filter>
- </ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\RecursiveLinearFilter.cpp">
- <Filter>dsp</Filter>
- </ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\wav.cpp">
- <Filter>dsp</Filter>
- </ClCompile>
<ClCompile Include="..\NeuralAmpModelerCore\NAM\convnet.cpp">
<Filter>NAM</Filter>
</ClCompile>
@@ -113,6 +98,21 @@
<ClCompile Include="..\NeuralAmpModelerCore\NAM\activations.cpp">
<Filter>NAM</Filter>
</ClCompile>
+ <ClCompile Include="..\AudioDSPTools\dsp\dsp.cpp">
+ <Filter>dsp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\AudioDSPTools\dsp\ImpulseResponse.cpp">
+ <Filter>dsp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\AudioDSPTools\dsp\NoiseGate.cpp">
+ <Filter>dsp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\AudioDSPTools\dsp\RecursiveLinearFilter.cpp">
+ <Filter>dsp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\AudioDSPTools\dsp\wav.cpp">
+ <Filter>dsp</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\NeuralAmpModeler.h" />
@@ -295,24 +295,6 @@
<Filter>IGraphics</Filter>
</ClInclude>
<ClInclude Include="..\Colors.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\dsp.h">
- <Filter>dsp</Filter>
- </ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\ImpulseResponse.h">
- <Filter>dsp</Filter>
- </ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\NoiseGate.h">
- <Filter>dsp</Filter>
- </ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\RecursiveLinearFilter.h">
- <Filter>dsp</Filter>
- </ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\Resample.h">
- <Filter>dsp</Filter>
- </ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\wav.h">
- <Filter>dsp</Filter>
- </ClInclude>
<ClInclude Include="..\NeuralAmpModelerCore\NAM\activations.h">
<Filter>NAM</Filter>
</ClInclude>
@@ -335,6 +317,27 @@
<Filter>NAM</Filter>
</ClInclude>
<ClInclude Include="..\NeuralAmpModelerControls.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\dsp.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\ImpulseResponse.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\NoiseGate.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\RecursiveLinearFilter.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\Resample.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\version.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\wav.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="resources">
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj
@@ -630,7 +630,7 @@
4FBDC93D29FFF143004FF203 /* wav.cpp */,
);
name = dsp;
- path = ../NeuralAmpModelerCore/dsp;
+ path = ../AudioDSPTools/dsp;
sourceTree = "<group>";
};
4FBDC93E29FFF143004FF203 /* NAM */ = {
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj
@@ -1250,7 +1250,7 @@
4F2FB13C2A0047420027AB66 /* wav.h */,
);
name = dsp;
- path = ../NeuralAmpModelerCore/dsp;
+ path = ../AudioDSPTools/dsp;
sourceTree = "<group>";
};
4F2FB1452A0047420027AB66 /* NAM */ = {
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj
@@ -326,15 +326,16 @@
<ClInclude Include="..\..\iPlug2\IPlug\VST3\IPlugVST3_Parameter.h" />
<ClInclude Include="..\..\iPlug2\IPlug\VST3\IPlugVST3_ProcessorBase.h" />
<ClInclude Include="..\..\iPlug2\IPlug\VST3\IPlugVST3_View.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\dsp.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\ImpulseResponse.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\NoiseGate.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\RecursiveLinearFilter.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\Resample.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\version.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\wav.h" />
<ClInclude Include="..\Colors.h" />
<ClInclude Include="..\NeuralAmpModeler.h" />
<ClInclude Include="..\NeuralAmpModelerControls.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\dsp.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\ImpulseResponse.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\NoiseGate.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\RecursiveLinearFilter.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\Resample.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\wav.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\activations.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\convnet.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\dsp.h" />
@@ -403,19 +404,12 @@
<ClCompile Include="..\..\iPlug2\IPlug\IPlugTimer.cpp" />
<ClCompile Include="..\..\iPlug2\IPlug\VST3\IPlugVST3.cpp" />
<ClCompile Include="..\..\iPlug2\IPlug\VST3\IPlugVST3_ProcessorBase.cpp" />
+ <ClCompile Include="..\AudioDSPTools\dsp\dsp.cpp" />
+ <ClCompile Include="..\AudioDSPTools\dsp\ImpulseResponse.cpp" />
+ <ClCompile Include="..\AudioDSPTools\dsp\NoiseGate.cpp" />
+ <ClCompile Include="..\AudioDSPTools\dsp\RecursiveLinearFilter.cpp" />
+ <ClCompile Include="..\AudioDSPTools\dsp\wav.cpp" />
<ClCompile Include="..\NeuralAmpModeler.cpp" />
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\dsp.cpp">
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(RelativeDir)</ObjectFileName>
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Tracer|Win32'">$(IntDir)%(RelativeDir)</ObjectFileName>
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(RelativeDir)</ObjectFileName>
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(RelativeDir)</ObjectFileName>
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Tracer|x64'">$(IntDir)%(RelativeDir)</ObjectFileName>
- <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(RelativeDir)</ObjectFileName>
- </ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\ImpulseResponse.cpp" />
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\NoiseGate.cpp" />
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\RecursiveLinearFilter.cpp" />
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\wav.cpp" />
<ClCompile Include="..\NeuralAmpModelerCore\NAM\activations.cpp" />
<ClCompile Include="..\NeuralAmpModelerCore\NAM\convnet.cpp" />
<ClCompile Include="..\NeuralAmpModelerCore\NAM\dsp.cpp">
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj.filters b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj.filters
@@ -134,21 +134,6 @@
<ClCompile Include="..\..\iPlug2\IGraphics\IGraphicsEditorDelegate.cpp">
<Filter>IGraphics</Filter>
</ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\dsp.cpp">
- <Filter>dsp</Filter>
- </ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\ImpulseResponse.cpp">
- <Filter>dsp</Filter>
- </ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\NoiseGate.cpp">
- <Filter>dsp</Filter>
- </ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\RecursiveLinearFilter.cpp">
- <Filter>dsp</Filter>
- </ClCompile>
- <ClCompile Include="..\NeuralAmpModelerCore\dsp\wav.cpp">
- <Filter>dsp</Filter>
- </ClCompile>
<ClCompile Include="..\NeuralAmpModelerCore\NAM\convnet.cpp">
<Filter>NAM</Filter>
</ClCompile>
@@ -170,6 +155,21 @@
<ClCompile Include="..\NeuralAmpModelerCore\NAM\activations.cpp">
<Filter>NAM</Filter>
</ClCompile>
+ <ClCompile Include="..\AudioDSPTools\dsp\dsp.cpp">
+ <Filter>dsp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\AudioDSPTools\dsp\ImpulseResponse.cpp">
+ <Filter>dsp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\AudioDSPTools\dsp\NoiseGate.cpp">
+ <Filter>dsp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\AudioDSPTools\dsp\RecursiveLinearFilter.cpp">
+ <Filter>dsp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\AudioDSPTools\dsp\wav.cpp">
+ <Filter>dsp</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="../config.h" />
@@ -394,24 +394,6 @@
<Filter>IGraphics</Filter>
</ClInclude>
<ClInclude Include="..\Colors.h" />
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\dsp.h">
- <Filter>dsp</Filter>
- </ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\ImpulseResponse.h">
- <Filter>dsp</Filter>
- </ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\NoiseGate.h">
- <Filter>dsp</Filter>
- </ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\RecursiveLinearFilter.h">
- <Filter>dsp</Filter>
- </ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\Resample.h">
- <Filter>dsp</Filter>
- </ClInclude>
- <ClInclude Include="..\NeuralAmpModelerCore\dsp\wav.h">
- <Filter>dsp</Filter>
- </ClInclude>
<ClInclude Include="..\NeuralAmpModelerCore\NAM\activations.h">
<Filter>NAM</Filter>
</ClInclude>
@@ -434,6 +416,27 @@
<Filter>NAM</Filter>
</ClInclude>
<ClInclude Include="..\NeuralAmpModelerControls.h" />
+ <ClInclude Include="..\AudioDSPTools\dsp\dsp.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\ImpulseResponse.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\NoiseGate.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\RecursiveLinearFilter.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\Resample.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\version.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\AudioDSPTools\dsp\wav.h">
+ <Filter>dsp</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="resources">
@@ -493,12 +496,12 @@
<Filter Include="IPlug\VST3\VST3_SDK\plugininterfaces\base">
<UniqueIdentifier>{5f06b03e-5093-46c0-9513-efb4e494c857}</UniqueIdentifier>
</Filter>
- <Filter Include="dsp">
- <UniqueIdentifier>{982fc658-4802-43b8-95dd-f18fb814e389}</UniqueIdentifier>
- </Filter>
<Filter Include="NAM">
<UniqueIdentifier>{3d65ee8b-86ee-4713-a5ec-d73919c6419c}</UniqueIdentifier>
</Filter>
+ <Filter Include="dsp">
+ <UniqueIdentifier>{ed745419-3921-4abe-8286-170fa316a5ac}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\resources\main.rc">
