diff --git a/NeuralAmpModeler/NeuralAmpModeler.cpp b/NeuralAmpModeler/NeuralAmpModeler.cpp index 7774c4ba0..bb3916fc7 100644 --- a/NeuralAmpModeler/NeuralAmpModeler.cpp +++ b/NeuralAmpModeler/NeuralAmpModeler.cpp @@ -322,7 +322,7 @@ void NeuralAmpModeler::ProcessBlock(iplug::sample** inputs, iplug::sample** outp if (mModel != nullptr) { - mModel->process(triggerOutput[0], mOutputPointers[0], nFrames); + mModel->process(triggerOutput, mOutputPointers, nFrames); } else { @@ -693,6 +693,18 @@ std::string NeuralAmpModeler::_StageModel(const WDL_String& modelPath) { auto dspPath = std::filesystem::u8path(modelPath.Get()); std::unique_ptr model = nam::get_dsp(dspPath); + + // Check that the model has 1 input and 1 output channel + if (model->NumInputChannels() != 1) + { + throw std::runtime_error("Model must have 1 input channel, but has " + std::to_string(model->NumInputChannels())); + } + if (model->NumOutputChannels() != 1) + { + throw std::runtime_error("Model must have 1 output channel, but has " + + std::to_string(model->NumOutputChannels())); + } + std::unique_ptr temp = std::make_unique(std::move(model), GetSampleRate()); temp->Reset(GetSampleRate(), GetBlockSize()); mStagedModel = std::move(temp); diff --git a/NeuralAmpModeler/NeuralAmpModeler.h b/NeuralAmpModeler/NeuralAmpModeler.h index f22298cdf..446bbf42c 100644 --- a/NeuralAmpModeler/NeuralAmpModeler.h +++ b/NeuralAmpModeler/NeuralAmpModeler.h @@ -95,13 +95,13 @@ class ResamplingNAM : public nam::DSP public: // Resampling wrapper around the NAM models ResamplingNAM(std::unique_ptr encapsulated, const double expected_sample_rate) - : nam::DSP(expected_sample_rate) + : nam::DSP(encapsulated->NumInputChannels(), encapsulated->NumOutputChannels(), expected_sample_rate) , mEncapsulated(std::move(encapsulated)) , mResampler(GetNAMSampleRate(mEncapsulated)) { // Assign the encapsulated object's processing function to this object's member so that the resampler can use it: auto ProcessBlockFunc = [&](NAM_SAMPLE** input, NAM_SAMPLE** output, int numFrames) { - mEncapsulated->process(input[0], output[0], numFrames); + mEncapsulated->process(input, output, numFrames); }; mBlockProcessFunc = ProcessBlockFunc; @@ -133,7 +133,7 @@ class ResamplingNAM : public nam::DSP void prewarm() override { mEncapsulated->prewarm(); }; - void process(NAM_SAMPLE* input, NAM_SAMPLE* output, const int num_frames) override + void process(NAM_SAMPLE** input, NAM_SAMPLE** output, const int num_frames) override { if (num_frames > mMaxExternalBlockSize) // We can afford to be careful @@ -145,7 +145,7 @@ class ResamplingNAM : public nam::DSP } else { - mResampler.ProcessBlock(&input, &output, num_frames, mBlockProcessFunc); + mResampler.ProcessBlock(input, output, num_frames, mBlockProcessFunc); } }; diff --git a/NeuralAmpModeler/config/NeuralAmpModeler-mac.xcconfig b/NeuralAmpModeler/config/NeuralAmpModeler-mac.xcconfig index e03e26746..5291fe263 100644 --- a/NeuralAmpModeler/config/NeuralAmpModeler-mac.xcconfig +++ b/NeuralAmpModeler/config/NeuralAmpModeler-mac.xcconfig @@ -24,7 +24,7 @@ EXTRA_LNK_FLAGS = -framework Accelerate -framework Metal -framework MetalKit // //------------------------------ // PREPROCESSOR MACROS -EXTRA_ALL_DEFS = OBJC_PREFIX=vNeuralAmpModeler SWELL_APP_PREFIX=Swell_vNeuralAmpModeler IGRAPHICS_NANOVG IGRAPHICS_METAL GRAYED_ALPHA=0.5f +EXTRA_ALL_DEFS = OBJC_PREFIX=vNeuralAmpModeler SWELL_APP_PREFIX=Swell_vNeuralAmpModeler IGRAPHICS_NANOVG IGRAPHICS_METAL GRAYED_ALPHA=0.5f NAM_ENABLE_A2_FAST //EXTRA_DEBUG_DEFS = //EXTRA_RELEASE_DEFS = //EXTRA_TRACER_DEFS = diff --git a/NeuralAmpModeler/config/NeuralAmpModeler-win.props b/NeuralAmpModeler/config/NeuralAmpModeler-win.props index 3ce7f9b59..c69767281 100644 --- a/NeuralAmpModeler/config/NeuralAmpModeler-win.props +++ b/NeuralAmpModeler/config/NeuralAmpModeler-win.props @@ -3,7 +3,7 @@ $(ProjectDir)..\..\iPlug2 NeuralAmpModeler - IGRAPHICS_NANOVG;IGRAPHICS_GL2;GRAYED_ALPHA=0.5f + IGRAPHICS_NANOVG;IGRAPHICS_GL2;GRAYED_ALPHA=0.5f;NAM_ENABLE_A2_FAST @@ -27,7 +27,7 @@ $(PDB_FILE) - CALL "$(SolutionDir)scripts\postbuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(COPY_VST2)" "$(TargetPath)" "$(VST2_32_PATH)" "$(VST2_64_PATH)" "$(VST3_32_PATH)" "$(VST3_64_PATH)" "$(AAX_32_PATH)" "$(AAX_64_PATH)" "$(BUILD_DIR)" "$(VST_ICON)" "$(AAX_ICON)" "$(CREATE_BUNDLE_SCRIPT)" + CALL "$(SolutionDir)scripts\postbuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(TargetPath)" "$(VST3_32_PATH)" "$(VST3_64_PATH)" "$(AAX_32_PATH)" "$(AAX_64_PATH)" "$(BUILD_DIR)" "$(VST_ICON)" "$(AAX_ICON)" "$(CREATE_BUNDLE_SCRIPT)" CALL "$(SolutionDir)scripts\prebuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(TargetPath)" "$(OutDir)" diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj index ccd34be0f..b4ea647f2 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj @@ -1,556 +1,568 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - Tracer - Win32 - - - Tracer - x64 - - - - {DC4B5920-933D-4C82-B842-F34431D55A93} - NeuralAmpModeler-aax - ManagedCProj - 10.0 - - - - DynamicLibrary - v143 - - - DynamicLibrary - v143 - - - DynamicLibrary - v143 - - - DynamicLibrary - v143 - - - DynamicLibrary - v143 - - - DynamicLibrary - v143 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ - false - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ - false - false - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ - false - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ - $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ - false - false - - - .aaxplugin - - - .aaxplugin - - - .aaxplugin - - - .aaxplugin - - - .aaxplugin - - - .aaxplugin - - - - - - - - - %(Outputs) - - - Disabled - $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) - $(AAX_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) - false - Async - EnableFastChecks - MultiThreadedDebug - true - $(IntDir)..\NeuralAmpModeler.pch - Level3 - ProgramDatabase - Default - %(ForcedIncludeFiles) - - - $(AAX_LIBS);%(AdditionalDependencies) - $(OutDir)$(BINARY_NAME).aaxplugin - true - - - Windows - $(IntDir)$(TargetName).lib - - - - - - - - - - - - %(Outputs) - - - MaxSpeed - Speed - $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) - $(AAX_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) - false - Async - MultiThreaded - StreamingSIMDExtensions2 - true - - - - - Level3 - ProgramDatabase - Default - %(ForcedIncludeFiles) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(AAX_LIBS);%(AdditionalDependencies) - $(OutDir)$(BINARY_NAME).aaxplugin - true - Windows - $(IntDir)$(TargetName).lib - - - - - - - - - - - - %(Outputs) - - - MaxSpeed - Speed - $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) - $(AAX_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) - false - Async - MultiThreaded - StreamingSIMDExtensions2 - true - - - - - Level3 - ProgramDatabase - Default - %(ForcedIncludeFiles) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(AAX_LIBS);%(AdditionalDependencies) - $(OutDir)$(BINARY_NAME).aaxplugin - true - Windows - $(IntDir)$(TargetName).lib - - - - - - - - - - - - %(Outputs) - - - X64 - - - Disabled - $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) - $(AAX_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) - false - Async - EnableFastChecks - MultiThreadedDebug - true - $(IntDir)..\NeuralAmpModeler.pch - Level3 - ProgramDatabase - Default - %(ForcedIncludeFiles) - - - $(AAX_LIBS);%(AdditionalDependencies) - $(OutDir)$(BINARY_NAME).aaxplugin - true - - - Windows - $(IntDir)$(TargetName).lib - MachineX64 - - - - - - - - - - - - %(Outputs) - - - X64 - - - MaxSpeed - $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) - $(AAX_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) - false - Async - MultiThreaded - true - - - - - Level3 - ProgramDatabase - Default - %(ForcedIncludeFiles) - Speed - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(AAX_LIBS);%(AdditionalDependencies) - $(OutDir)$(BINARY_NAME).aaxplugin - true - Windows - $(IntDir)$(TargetName).lib - MachineX64 - - - - - - - - - - - - %(Outputs) - - - X64 - - - MaxSpeed - $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) - $(AAX_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) - false - Async - MultiThreaded - true - - - - - Level3 - ProgramDatabase - Default - %(ForcedIncludeFiles) - Speed - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(AAX_LIBS);%(AdditionalDependencies) - $(OutDir)$(BINARY_NAME).aaxplugin - true - Windows - $(IntDir)$(TargetName).lib - MachineX64 - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - - - - - - - - - - Document - true - true - true - - - Document - true - true - true - true - - - Document - true - true - true - - - Document - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Tracer + Win32 + + + Tracer + x64 + + + + {DC4B5920-933D-4C82-B842-F34431D55A93} + NeuralAmpModeler-aax + ManagedCProj + 10.0 + + + + DynamicLibrary + v143 + + + DynamicLibrary + v143 + + + DynamicLibrary + v143 + + + DynamicLibrary + v143 + + + DynamicLibrary + v143 + + + DynamicLibrary + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ + false + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ + false + false + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ + false + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ + false + false + + + .aaxplugin + + + .aaxplugin + + + .aaxplugin + + + .aaxplugin + + + .aaxplugin + + + .aaxplugin + + + + + + + + + %(Outputs) + + + Disabled + $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) + $(AAX_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) + false + Async + EnableFastChecks + MultiThreadedDebug + true + $(IntDir)..\NeuralAmpModeler.pch + Level3 + ProgramDatabase + Default + %(ForcedIncludeFiles) + + + $(AAX_LIBS);%(AdditionalDependencies) + $(OutDir)$(BINARY_NAME).aaxplugin + true + + + Windows + $(IntDir)$(TargetName).lib + + + + + + + + + + + + %(Outputs) + + + MaxSpeed + Speed + $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) + $(AAX_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + false + Async + MultiThreaded + StreamingSIMDExtensions2 + true + + + + + Level3 + ProgramDatabase + Default + %(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(AAX_LIBS);%(AdditionalDependencies) + $(OutDir)$(BINARY_NAME).aaxplugin + true + Windows + $(IntDir)$(TargetName).lib + + + + + + + + + + + + %(Outputs) + + + MaxSpeed + Speed + $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) + $(AAX_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) + false + Async + MultiThreaded + StreamingSIMDExtensions2 + true + + + + + Level3 + ProgramDatabase + Default + %(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(AAX_LIBS);%(AdditionalDependencies) + $(OutDir)$(BINARY_NAME).aaxplugin + true + Windows + $(IntDir)$(TargetName).lib + + + + + + + + + + + + %(Outputs) + + + X64 + + + Disabled + $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) + $(AAX_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) + false + Async + EnableFastChecks + MultiThreadedDebug + true + $(IntDir)..\NeuralAmpModeler.pch + Level3 + ProgramDatabase + Default + %(ForcedIncludeFiles) + + + $(AAX_LIBS);%(AdditionalDependencies) + $(OutDir)$(BINARY_NAME).aaxplugin + true + + + Windows + $(IntDir)$(TargetName).lib + MachineX64 + + + + + + + + + + + + %(Outputs) + + + X64 + + + MaxSpeed + $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) + $(AAX_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + false + Async + MultiThreaded + true + + + + + Level3 + ProgramDatabase + Default + %(ForcedIncludeFiles) + Speed + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(AAX_LIBS);%(AdditionalDependencies) + $(OutDir)$(BINARY_NAME).aaxplugin + true + Windows + $(IntDir)$(TargetName).lib + MachineX64 + + + + + + + + + + + + %(Outputs) + + + X64 + + + MaxSpeed + $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) + $(AAX_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) + false + Async + MultiThreaded + true + + + + + Level3 + ProgramDatabase + Default + %(ForcedIncludeFiles) + Speed + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(AAX_LIBS);%(AdditionalDependencies) + $(OutDir)$(BINARY_NAME).aaxplugin + true + Windows + $(IntDir)$(TargetName).lib + MachineX64 + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + + + + + + + + + + + + + + Document + true + true + true + + + Document + true + true + true + true + + + Document + true + true + true + + + Document + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj index d81a7e050..e016cc972 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj @@ -1,430 +1,442 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - Tracer - Win32 - - - Tracer - x64 - - - - {41785AE4-5B70-4A75-880B-4B418B4E13C6} - NeuralAmpModeler - NeuralAmpModeler-app - 10.0 - - - - Application - true - MultiByte - v143 - - - Application - true - MultiByte - v143 - - - Application - false - true - MultiByte - v143 - - - Application - false - true - MultiByte - v143 - - - Application - false - true - MultiByte - v143 - - - Application - false - true - MultiByte - v143 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ - - - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ - - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ - - - $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ - - - - Level3 - Disabled - $(APP_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) - $(APP_INC_PATHS);%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - $(APP_LIBS);%(AdditionalDependencies) - Windows - - - - - - - - - Level3 - Disabled - $(APP_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) - $(APP_INC_PATHS);%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - $(APP_LIBS);%(AdditionalDependencies) - Windows - - - - - - - - - Level3 - MaxSpeed - true - true - $(APP_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) - $(APP_INC_PATHS);%(AdditionalIncludeDirectories) - true - Speed - - - true - true - $(APP_LIBS);%(AdditionalDependencies) - Windows - - - SA_API - - - - - Level3 - MaxSpeed - true - true - $(APP_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) - $(APP_INC_PATHS);%(AdditionalIncludeDirectories) - true - Speed - - - true - true - $(APP_LIBS);%(AdditionalDependencies) - Windows - - - SA_API - - - - - Level3 - MaxSpeed - true - true - $(APP_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) - $(APP_INC_PATHS);%(AdditionalIncludeDirectories) - true - - - true - true - $(APP_LIBS);%(AdditionalDependencies) - Windows - - - SA_API - - - - - Level3 - MaxSpeed - true - true - $(APP_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) - $(APP_INC_PATHS);%(AdditionalIncludeDirectories) - true - - - true - true - $(APP_LIBS);%(AdditionalDependencies) - Windows - - - SA_API - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - - - - - - - - - - - - - - - - - - Designer - - - - - - - - - + + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Tracer + Win32 + + + Tracer + x64 + + + + {41785AE4-5B70-4A75-880B-4B418B4E13C6} + NeuralAmpModeler + NeuralAmpModeler-app + 10.0 + + + + Application + true + MultiByte + v143 + + + Application + true + MultiByte + v143 + + + Application + false + true + MultiByte + v143 + + + Application + false + true + MultiByte + v143 + + + Application + false + true + MultiByte + v143 + + + Application + false + true + MultiByte + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + + + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + + + + Level3 + Disabled + $(APP_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) + $(APP_INC_PATHS);%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + $(APP_LIBS);%(AdditionalDependencies) + Windows + + + + + + + + + Level3 + Disabled + $(APP_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) + $(APP_INC_PATHS);%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + $(APP_LIBS);%(AdditionalDependencies) + Windows + + + + + + + + + Level3 + MaxSpeed + true + true + $(APP_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + $(APP_INC_PATHS);%(AdditionalIncludeDirectories) + true + Speed + + + true + true + $(APP_LIBS);%(AdditionalDependencies) + Windows + + + SA_API + + + + + Level3 + MaxSpeed + true + true + $(APP_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + $(APP_INC_PATHS);%(AdditionalIncludeDirectories) + true + Speed + + + true + true + $(APP_LIBS);%(AdditionalDependencies) + Windows + + + SA_API + + + + + Level3 + MaxSpeed + true + true + $(APP_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) + $(APP_INC_PATHS);%(AdditionalIncludeDirectories) + true + + + true + true + $(APP_LIBS);%(AdditionalDependencies) + Windows + + + SA_API + + + + + Level3 + MaxSpeed + true + true + $(APP_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) + $(APP_INC_PATHS);%(AdditionalIncludeDirectories) + true + + + true + true + $(APP_LIBS);%(AdditionalDependencies) + Windows + + + SA_API + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + + + + + + + + + + + + + + + + + + + + + + Designer + + + + + + + + + \ No newline at end of file diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj index 04bdb95e5..cf9d95eb7 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj @@ -44,14 +44,23 @@ 4FBDC95B29FFF143004FF203 /* convnet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC94229FFF143004FF203 /* convnet.h */; }; 4FBDC95C29FFF143004FF203 /* lstm.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC94329FFF143004FF203 /* lstm.h */; }; 4FBDC95D29FFF143004FF203 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94429FFF143004FF203 /* convnet.cpp */; }; - 4FBDC95E29FFF143004FF203 /* wavenet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC94529FFF143004FF203 /* wavenet.h */; }; + 4FBDC95E29FFF143004FF203 /* model.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC94529FFF143004FF203 /* model.h */; }; 4FBDC95F29FFF143004FF203 /* lstm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94629FFF143004FF203 /* lstm.cpp */; }; 4FBDC96029FFF143004FF203 /* util.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC94729FFF143004FF203 /* util.h */; }; 4FBDC96129FFF143004FF203 /* dsp.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC94829FFF143004FF203 /* dsp.h */; }; 4FBDC96229FFF143004FF203 /* activations.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC94929FFF143004FF203 /* activations.h */; }; 4FBDC96329FFF143004FF203 /* activations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94A29FFF143004FF203 /* activations.cpp */; }; - 4FBDC96429FFF143004FF203 /* wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94B29FFF143004FF203 /* wavenet.cpp */; }; + 4FBDC96429FFF143004FF203 /* model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94B29FFF143004FF203 /* model.cpp */; }; + 4FBDC98029FFF143004FF203 /* slimmable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97E29FFF143004FF203 /* slimmable.cpp */; }; + 4FBDC98129FFF143004FF203 /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97F29FFF143004FF203 /* container.cpp */; }; 4FBDC96529FFF143004FF203 /* get_dsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94C29FFF143004FF203 /* get_dsp.cpp */; }; + 4FBDC97729FFF143004FF203 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97029FFF143004FF203 /* conv1d.cpp */; }; + 4FBDC97829FFF143004FF203 /* conv1d.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97129FFF143004FF203 /* conv1d.h */; }; + 4FBDC97929FFF143004FF203 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97229FFF143004FF203 /* ring_buffer.cpp */; }; + 4FBDC97A29FFF143004FF203 /* ring_buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97329FFF143004FF203 /* ring_buffer.h */; }; + 4FBDC97B29FFF143004FF203 /* film.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97429FFF143004FF203 /* film.h */; }; + 4FBDC97C29FFF143004FF203 /* gating_activations.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97529FFF143004FF203 /* gating_activations.h */; }; + 4FBDC97D29FFF143004FF203 /* registry.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97629FFF143004FF203 /* registry.h */; }; 4FC69835293BA47F0076EC33 /* NeuralAmpModelerAU.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FC6982F293BA47F0076EC33 /* NeuralAmpModelerAU.framework */; }; 4FC69836293BA47F0076EC33 /* NeuralAmpModelerAU.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4FC6982F293BA47F0076EC33 /* NeuralAmpModelerAU.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4FC6983A293BA4F10076EC33 /* NeuralAmpModelerAU.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FA61F7B22E89A5900A92C58 /* NeuralAmpModelerAU.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -280,13 +289,22 @@ 4FBDC94229FFF143004FF203 /* convnet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = convnet.h; sourceTree = ""; }; 4FBDC94329FFF143004FF203 /* lstm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lstm.h; sourceTree = ""; }; 4FBDC94429FFF143004FF203 /* convnet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = convnet.cpp; sourceTree = ""; }; - 4FBDC94529FFF143004FF203 /* wavenet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet.h; sourceTree = ""; }; + 4FBDC94529FFF143004FF203 /* model.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet/model.h; sourceTree = ""; }; 4FBDC94629FFF143004FF203 /* lstm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lstm.cpp; sourceTree = ""; }; + 4FBDC97029FFF143004FF203 /* conv1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = conv1d.cpp; sourceTree = ""; }; + 4FBDC97129FFF143004FF203 /* conv1d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conv1d.h; sourceTree = ""; }; + 4FBDC97229FFF143004FF203 /* ring_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ring_buffer.cpp; sourceTree = ""; }; + 4FBDC97329FFF143004FF203 /* ring_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ring_buffer.h; sourceTree = ""; }; + 4FBDC97429FFF143004FF203 /* film.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = film.h; sourceTree = ""; }; + 4FBDC97529FFF143004FF203 /* gating_activations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gating_activations.h; sourceTree = ""; }; + 4FBDC97629FFF143004FF203 /* registry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = registry.h; sourceTree = ""; }; 4FBDC94729FFF143004FF203 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = ""; }; 4FBDC94829FFF143004FF203 /* dsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dsp.h; sourceTree = ""; }; 4FBDC94929FFF143004FF203 /* activations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = activations.h; sourceTree = ""; }; 4FBDC94A29FFF143004FF203 /* activations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = activations.cpp; sourceTree = ""; }; - 4FBDC94B29FFF143004FF203 /* wavenet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet.cpp; sourceTree = ""; }; + 4FBDC94B29FFF143004FF203 /* model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/model.cpp; sourceTree = ""; }; + 4FBDC97E29FFF143004FF203 /* slimmable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/slimmable.cpp; sourceTree = ""; }; + 4FBDC97F29FFF143004FF203 /* container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = container.cpp; sourceTree = ""; }; 4FBDC94C29FFF143004FF203 /* get_dsp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_dsp.cpp; sourceTree = ""; }; 4FC46E58231440C8000045E7 /* web */ = {isa = PBXFileReference; lastKnownFileType = folder; name = web; path = ../resources/web; sourceTree = ""; }; 4FC6982F293BA47F0076EC33 /* NeuralAmpModelerAU.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NeuralAmpModelerAU.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -670,8 +688,17 @@ 4FBDC93F29FFF143004FF203 /* util.cpp */, 4FBDC94729FFF143004FF203 /* util.h */, 4FBDC94029FFF143004FF203 /* version.h */, - 4FBDC94B29FFF143004FF203 /* wavenet.cpp */, - 4FBDC94529FFF143004FF203 /* wavenet.h */, + 4FBDC94B29FFF143004FF203 /* model.cpp */, + 4FBDC97E29FFF143004FF203 /* slimmable.cpp */, + 4FBDC97F29FFF143004FF203 /* container.cpp */, + 4FBDC94529FFF143004FF203 /* model.h */, + 4FBDC97029FFF143004FF203 /* conv1d.cpp */, + 4FBDC97129FFF143004FF203 /* conv1d.h */, + 4FBDC97229FFF143004FF203 /* ring_buffer.cpp */, + 4FBDC97329FFF143004FF203 /* ring_buffer.h */, + 4FBDC97429FFF143004FF203 /* film.h */, + 4FBDC97529FFF143004FF203 /* gating_activations.h */, + 4FBDC97629FFF143004FF203 /* registry.h */, ); name = NAM; path = ../../NeuralAmpModelerCore/NAM; @@ -832,7 +859,12 @@ 4FBDC94D29FFF143004FF203 /* Resample.h in Headers */, 4FC6983A293BA4F10076EC33 /* NeuralAmpModelerAU.h in Headers */, 4FBDC95629FFF143004FF203 /* dsp.h in Headers */, - 4FBDC95E29FFF143004FF203 /* wavenet.h in Headers */, + 4FBDC95E29FFF143004FF203 /* model.h in Headers */, + 4FBDC97829FFF143004FF203 /* conv1d.h in Headers */, + 4FBDC97A29FFF143004FF203 /* ring_buffer.h in Headers */, + 4FBDC97B29FFF143004FF203 /* film.h in Headers */, + 4FBDC97C29FFF143004FF203 /* gating_activations.h in Headers */, + 4FBDC97D29FFF143004FF203 /* registry.h in Headers */, 4FC6983B293BA5020076EC33 /* IPlugAUAudioUnit.h in Headers */, AA7C860B2B43A42F00B5FB3A /* ResamplingContainer.h in Headers */, AA341E2B2B9E5A650069C260 /* ToneStack.h in Headers */, @@ -1058,7 +1090,11 @@ 4FBDC94E29FFF143004FF203 /* RecursiveLinearFilter.cpp in Sources */, 4FBDC95829FFF143004FF203 /* util.cpp in Sources */, 4FC69849293BA5F90076EC33 /* ITextEntryControl.cpp in Sources */, - 4FBDC96429FFF143004FF203 /* wavenet.cpp in Sources */, + 4FBDC96429FFF143004FF203 /* model.cpp in Sources */, + 4FBDC98029FFF143004FF203 /* slimmable.cpp in Sources */, + 4FBDC98129FFF143004FF203 /* container.cpp in Sources */, + 4FBDC97729FFF143004FF203 /* conv1d.cpp in Sources */, + 4FBDC97929FFF143004FF203 /* ring_buffer.cpp in Sources */, 4FC6984C293BA6010076EC33 /* IGraphicsCoreText.mm in Sources */, 4FC6984F293BA6420076EC33 /* IControl.cpp in Sources */, 4FC69848293BA5F90076EC33 /* IControls.cpp in Sources */, diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj index 9ee8d2eb8..3e03e6b10 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj @@ -137,13 +137,36 @@ 4F2FB19C2A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; 4F2FB19D2A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; 4F2FB19E2A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; + 4F2FB1CE2A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1CF2A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D02A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D12A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D22A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D32A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D42A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D52A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D62A0047430027AB66 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1562A0047420027AB67 /* conv1d.cpp */; }; + 4F2FB1D72A0047430027AB66 /* conv1d.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB1572A0047420027AB67 /* conv1d.h */; }; + 4F2FB1D82A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1D92A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1DA2A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1DB2A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1DC2A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1DD2A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1DE2A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1DF2A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1E02A0047430027AB66 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */; }; + 4F2FB1E12A0047430027AB66 /* ring_buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB1592A0047420027AB67 /* ring_buffer.h */; }; 4F2FB19F2A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; 4F2FB1A02A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; 4F2FB1A12A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; 4F2FB1A22A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; 4F2FB1A32A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; 4F2FB1A42A0047430027AB66 /* convnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14B2A0047420027AB66 /* convnet.cpp */; }; - 4F2FB1A52A0047430027AB66 /* wavenet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB14C2A0047420027AB66 /* wavenet.h */; }; + 4F2FB1A52A0047430027AB66 /* model.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB14C2A0047420027AB66 /* model.h */; }; + 4F2FB1E22A0047430027AB68 /* film.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB15A2A0047420027AB68 /* film.h */; }; + 4F2FB1E32A0047430027AB68 /* gating_activations.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB15B2A0047420027AB68 /* gating_activations.h */; }; + 4F2FB1E42A0047430027AB68 /* registry.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2FB15C2A0047420027AB68 /* registry.h */; }; 4F2FB1A62A0047430027AB66 /* lstm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14D2A0047420027AB66 /* lstm.cpp */; }; 4F2FB1A72A0047430027AB66 /* lstm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14D2A0047420027AB66 /* lstm.cpp */; }; 4F2FB1A82A0047430027AB66 /* lstm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB14D2A0047420027AB66 /* lstm.cpp */; }; @@ -174,6 +197,33 @@ 4F2FB1C12A0047430027AB66 /* wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1522A0047420027AB66 /* wavenet.cpp */; }; 4F2FB1C22A0047430027AB66 /* wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1522A0047420027AB66 /* wavenet.cpp */; }; 4F2FB1C32A0047430027AB66 /* wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1522A0047420027AB66 /* wavenet.cpp */; }; + B1D2F7012D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7022D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7032D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7042D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7052D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7062D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7072D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7082D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + B1D2F7092D0000020027AB66 /* slimmable_wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* slimmable_wavenet.cpp */; }; + C2A2FAE112D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE122D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE132D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE142D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE152D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE162D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE172D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE182D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + C2A2FAE192D0000120027AB66 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* a2_fast.cpp */; }; + AAB7E0112CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0122CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0132CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0142CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0152CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0162CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0172CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0182CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + AAB7E0192CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; 4F2FB1C42A0047430027AB66 /* get_dsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1532A0047420027AB66 /* get_dsp.cpp */; }; 4F2FB1C52A0047430027AB66 /* get_dsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1532A0047420027AB66 /* get_dsp.cpp */; }; 4F2FB1C62A0047430027AB66 /* get_dsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2FB1532A0047420027AB66 /* get_dsp.cpp */; }; @@ -668,13 +718,24 @@ 4F2FB1492A0047420027AB66 /* convnet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = convnet.h; sourceTree = ""; }; 4F2FB14A2A0047420027AB66 /* lstm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lstm.h; sourceTree = ""; }; 4F2FB14B2A0047420027AB66 /* convnet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = convnet.cpp; sourceTree = ""; }; - 4F2FB14C2A0047420027AB66 /* wavenet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet.h; sourceTree = ""; }; + 4F2FB1562A0047420027AB67 /* conv1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = conv1d.cpp; sourceTree = ""; }; + 4F2FB1572A0047420027AB67 /* conv1d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conv1d.h; sourceTree = ""; }; + 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ring_buffer.cpp; sourceTree = ""; }; + 4F2FB1592A0047420027AB67 /* ring_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ring_buffer.h; sourceTree = ""; }; + 4F2FB14C2A0047420027AB66 /* model.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet/model.h; sourceTree = ""; }; + 4F2FB15A2A0047420027AB68 /* film.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = film.h; sourceTree = ""; }; + 4F2FB15B2A0047420027AB68 /* gating_activations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gating_activations.h; sourceTree = ""; }; + 4F2FB15C2A0047420027AB68 /* registry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = registry.h; sourceTree = ""; }; 4F2FB14D2A0047420027AB66 /* lstm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lstm.cpp; sourceTree = ""; }; 4F2FB14E2A0047420027AB66 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = ""; }; 4F2FB14F2A0047420027AB66 /* dsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dsp.h; sourceTree = ""; }; 4F2FB1502A0047420027AB66 /* activations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = activations.h; sourceTree = ""; }; 4F2FB1512A0047420027AB66 /* activations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = activations.cpp; sourceTree = ""; }; - 4F2FB1522A0047420027AB66 /* wavenet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet.cpp; sourceTree = ""; }; + 4F2FB1522A0047420027AB66 /* model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/model.cpp; sourceTree = ""; }; + C2A2FAE012D0000110027AB66 /* a2_fast.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/a2_fast.cpp; sourceTree = ""; }; + C2A2FAE022D0000110027AB66 /* a2_fast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet/a2_fast.h; sourceTree = ""; }; + B1D2F7002D0000010027AB66 /* slimmable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/slimmable.cpp; sourceTree = ""; }; + AAB7E0102CC4B8C6000B8B6E /* container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = container.cpp; sourceTree = ""; }; 4F2FB1532A0047420027AB66 /* get_dsp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_dsp.cpp; sourceTree = ""; }; 4F35DEAB207E5C5A00867D8F /* IPlugPluginBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = IPlugPluginBase.cpp; path = ../../iPlug2/IPlug/IPlugPluginBase.cpp; sourceTree = ""; tabWidth = 2; }; 4F35DEAC207E5C5A00867D8F /* IPlugPluginBase.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugPluginBase.h; path = ../../iPlug2/IPlug/IPlugPluginBase.h; sourceTree = ""; tabWidth = 2; }; @@ -694,6 +755,8 @@ 4F3EE1F0231438D000004786 /* NeuralAmpModeler.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NeuralAmpModeler.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4F3EF92628DE6DF4002972F2 /* img */ = {isa = PBXFileReference; lastKnownFileType = folder; name = img; path = ../resources/img; sourceTree = ""; }; 4F3FB118202273A500622761 /* NeuralAmpModeler-macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "NeuralAmpModeler-macOS.entitlements"; sourceTree = ""; }; + 4F78D8D213B63B5D0032E0F3 /* aeffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aeffect.h; sourceTree = ""; }; + 4F78D8D313B63B5D0032E0F3 /* aeffectx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aeffectx.h; sourceTree = ""; }; 4F4237201FC852FE0067D58C /* IPlugConstants.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugConstants.h; path = ../../iPlug2/IPlug/IPlugConstants.h; sourceTree = ""; tabWidth = 2; }; 4F4237231FC863060067D58C /* IPlugUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugUtilities.h; path = ../../iPlug2/IPlug/IPlugUtilities.h; sourceTree = ""; tabWidth = 2; }; 4F472105209B37A100A0A0A8 /* IPlugVST3_View.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugVST3_View.h; path = ../../iPlug2/IPlug/VST3/IPlugVST3_View.h; sourceTree = ""; tabWidth = 2; }; @@ -719,8 +782,6 @@ 4F78BE1022E73DD900AD537E /* NeuralAmpModelerAU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NeuralAmpModelerAU.h; path = ../resources/NeuralAmpModelerAU.h; sourceTree = ""; }; 4F78BE1122E73DD900AD537E /* NeuralAmpModeler-macOS-AUv3Framework-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "NeuralAmpModeler-macOS-AUv3Framework-Info.plist"; path = "../resources/NeuralAmpModeler-macOS-AUv3Framework-Info.plist"; sourceTree = ""; }; 4F78D8BD13B63A4E0032E0F3 /* wdltypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wdltypes.h; path = ../../iPlug2/WDL/wdltypes.h; sourceTree = SOURCE_ROOT; }; - 4F78D8D213B63B5D0032E0F3 /* aeffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aeffect.h; sourceTree = ""; }; - 4F78D8D313B63B5D0032E0F3 /* aeffectx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aeffectx.h; sourceTree = ""; }; 4F78D8E613B63BA40032E0F3 /* IPlug_include_in_plug_hdr.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlug_include_in_plug_hdr.h; path = ../../iPlug2/IPlug/IPlug_include_in_plug_hdr.h; sourceTree = SOURCE_ROOT; tabWidth = 2; }; 4F78D8E813B63BA40032E0F3 /* IPlug_include_in_plug_src.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlug_include_in_plug_src.h; path = ../../iPlug2/IPlug/IPlug_include_in_plug_src.h; sourceTree = SOURCE_ROOT; tabWidth = 2; }; 4F78D8EC13B63BA40032E0F3 /* IPlugAPIBase.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugAPIBase.h; path = ../../iPlug2/IPlug/IPlugAPIBase.h; sourceTree = SOURCE_ROOT; tabWidth = 2; }; @@ -1159,8 +1220,8 @@ 4F23BA1413B647E50097A67E /* NeuralAmpModeler-macOS-Info.plist */, 4F3907872013ED2F00DDA490 /* NeuralAmpModeler-macOS-AUv3-Info.plist */, 4F78BE1122E73DD900AD537E /* NeuralAmpModeler-macOS-AUv3Framework-Info.plist */, - 4F23BA1513B647E50097A67E /* NeuralAmpModeler-VST2-Info.plist */, 4F3E693A1409747300C4D749 /* NeuralAmpModeler-VST3-Info.plist */, + 4F23BA1513B647E50097A67E /* NeuralAmpModeler-VST2-Info.plist */, 4F23BA1313B647E50097A67E /* NeuralAmpModeler-AU-Info.plist */, 4F4CC3811549B8A700A9EA21 /* NeuralAmpModeler-AAX-Info.plist */, ); @@ -1294,7 +1355,11 @@ 4F2FB1502A0047420027AB66 /* activations.h */, 4F2FB14B2A0047420027AB66 /* convnet.cpp */, 4F2FB1492A0047420027AB66 /* convnet.h */, + 4F2FB1562A0047420027AB67 /* conv1d.cpp */, + 4F2FB1572A0047420027AB67 /* conv1d.h */, 4F2FB1482A0047420027AB66 /* dsp.cpp */, + 4F2FB1582A0047420027AB67 /* ring_buffer.cpp */, + 4F2FB1592A0047420027AB67 /* ring_buffer.h */, 4F2FB14F2A0047420027AB66 /* dsp.h */, 4F2FB1532A0047420027AB66 /* get_dsp.cpp */, AAB7BBB62CC4B8C6000B8B6E /* get_dsp.h */, @@ -1303,8 +1368,15 @@ 4F2FB1462A0047420027AB66 /* util.cpp */, 4F2FB14E2A0047420027AB66 /* util.h */, 4F2FB1472A0047420027AB66 /* version.h */, - 4F2FB1522A0047420027AB66 /* wavenet.cpp */, - 4F2FB14C2A0047420027AB66 /* wavenet.h */, + 4F2FB1522A0047420027AB66 /* model.cpp */, + C2A2FAE012D0000110027AB66 /* a2_fast.cpp */, + C2A2FAE022D0000110027AB66 /* a2_fast.h */, + B1D2F7002D0000010027AB66 /* slimmable.cpp */, + AAB7E0102CC4B8C6000B8B6E /* container.cpp */, + 4F2FB14C2A0047420027AB66 /* model.h */, + 4F2FB15A2A0047420027AB68 /* film.h */, + 4F2FB15B2A0047420027AB68 /* gating_activations.h */, + 4F2FB15C2A0047420027AB68 /* registry.h */, ); name = NAM; path = ../../NeuralAmpModelerCore/NAM; @@ -1435,8 +1507,8 @@ 4F3907762013EBE800DDA490 /* AUv3 */, 4F4CC4241549BEBF00A9EA21 /* AAX */, 4F78D9FA13B63CA10032E0F3 /* APP */, - 4F3E69001409743C00C4D749 /* VST3 */, 4F78D9F713B63C710032E0F3 /* VST2 */, + 4F3E69001409743C00C4D749 /* VST3 */, 4F78D8E613B63BA40032E0F3 /* IPlug_include_in_plug_hdr.h */, 4F78D8E813B63BA40032E0F3 /* IPlug_include_in_plug_src.h */, 4FBAA593207918230054E717 /* IPlugDelegate_select.h */, @@ -2017,7 +2089,10 @@ 4F4856862773C3B5005BCF8E /* IPlugAUAudioUnit.h in Headers */, 4F2FB15F2A0047420027AB66 /* NoiseGate.h in Headers */, 4F2FB17D2A0047430027AB66 /* dsp.h in Headers */, - 4F2FB1A52A0047430027AB66 /* wavenet.h in Headers */, + 4F2FB1A52A0047430027AB66 /* model.h in Headers */, + 4F2FB1E22A0047430027AB68 /* film.h in Headers */, + 4F2FB1E32A0047430027AB68 /* gating_activations.h in Headers */, + 4F2FB1E42A0047430027AB68 /* registry.h in Headers */, 4F78BE1222E73DD900AD537E /* NeuralAmpModelerAU.h in Headers */, 4F2FB1542A0047420027AB66 /* Resample.h in Headers */, 4F2FB15E2A0047420027AB66 /* wav.h in Headers */, @@ -2635,6 +2710,11 @@ 4F7C4958255DDFC400DF7588 /* IControls.cpp in Sources */, 4F2FB1562A0047420027AB66 /* RecursiveLinearFilter.cpp in Sources */, 4F2FB1BC2A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7022D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE192D0000120027AB66 /* a2_fast.cpp in Sources */, + AAB7E0112CC4B8C6000B8B6E /* container.cpp in Sources */, + 4F2FB1CE2A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1D82A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1922A0047430027AB66 /* dsp.cpp in Sources */, 4F8D9707209EF5AC006E2A11 /* NeuralAmpModeler.cpp in Sources */, 4F7C495A255DDFC400DF7588 /* ITextEntryControl.cpp in Sources */, @@ -2658,6 +2738,11 @@ 4F2FB1A22A0047430027AB66 /* convnet.cpp in Sources */, 4F2FB1842A0047430027AB66 /* wav.cpp in Sources */, 4F2FB1C12A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7072D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE112D0000120027AB66 /* a2_fast.cpp in Sources */, + AAB7E0122CC4B8C6000B8B6E /* container.cpp in Sources */, + 4F2FB1CF2A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1D92A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1662A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1AC2A0047430027AB66 /* lstm.cpp in Sources */, 4F2FB1B82A0047430027AB66 /* activations.cpp in Sources */, @@ -2693,6 +2778,11 @@ 4F2FB18A2A0047430027AB66 /* util.cpp in Sources */, 4F993F7423055C96000313AF /* IPlugProcessor.cpp in Sources */, 4F2FB1BE2A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7042D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE122D0000120027AB66 /* a2_fast.cpp in Sources */, + AAB7E0132CC4B8C6000B8B6E /* container.cpp in Sources */, + 4F2FB1D02A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1DA2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F8C10E320BA2796006320CD /* IGraphicsEditorDelegate.cpp in Sources */, 4F6FD2B422675B6300FC59E6 /* IGraphicsCoreText.mm in Sources */, 4FDAC0ED207D76C600299363 /* IPlugTimer.cpp in Sources */, @@ -2731,6 +2821,11 @@ 4F3EE1CF231438D000004786 /* swell-menu.mm in Sources */, 4F2FB1992A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1C32A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7092D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE132D0000120027AB66 /* a2_fast.cpp in Sources */, + AAB7E0142CC4B8C6000B8B6E /* container.cpp in Sources */, + 4F2FB1D12A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1DB2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F3EE1D0231438D000004786 /* IGraphicsMac_view.mm in Sources */, 4F7C496E255DDFCB00DF7588 /* IPopupMenuControl.cpp in Sources */, 4F3EE1D1231438D000004786 /* swell-appstub.mm in Sources */, @@ -2795,6 +2890,11 @@ AA341E252B9E5A530069C260 /* ToneStack.cpp in Sources */, 4F78BE2522E7406D00AD537E /* IPlugPluginBase.cpp in Sources */, 4F2FB1C22A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7082D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE142D0000120027AB66 /* a2_fast.cpp in Sources */, + AAB7E0152CC4B8C6000B8B6E /* container.cpp in Sources */, + 4F2FB1D22A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1DC2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1A32A0047430027AB66 /* convnet.cpp in Sources */, 4F78BE2622E7406D00AD537E /* IPlugAPIBase.cpp in Sources */, 4F2FB1AD2A0047430027AB66 /* lstm.cpp in Sources */, @@ -2827,6 +2927,11 @@ 4F2FB1802A0047430027AB66 /* wav.cpp in Sources */, 4F2FB1622A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1BD2A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7032D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE152D0000120027AB66 /* a2_fast.cpp in Sources */, + AAB7E0162CC4B8C6000B8B6E /* container.cpp in Sources */, + 4F2FB1D32A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1DD2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F815919205D50EB00393585 /* memorystream.cpp in Sources */, 4F9828C1140A9EB700F3FCC1 /* IPlugParameter.cpp in Sources */, 4F81591A205D50EB00393585 /* pluginview.cpp in Sources */, @@ -2905,6 +3010,11 @@ AA341E212B9E5A530069C260 /* ToneStack.cpp in Sources */, 4FB600231567CB0A0020189A /* IPlugParameter.cpp in Sources */, 4F2FB1BF2A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7052D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE162D0000120027AB66 /* a2_fast.cpp in Sources */, + AAB7E0172CC4B8C6000B8B6E /* container.cpp in Sources */, + 4F2FB1D42A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1DE2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1A02A0047430027AB66 /* convnet.cpp in Sources */, 4FB600261567CB0A0020189A /* AAX_Exports.cpp in Sources */, 4F2FB1AA2A0047430027AB66 /* lstm.cpp in Sources */, @@ -2959,6 +3069,11 @@ 4FD16D3E13B63595001D0217 /* swell-menu.mm in Sources */, 4F2FB1912A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1BB2A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7012D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE172D0000120027AB66 /* a2_fast.cpp in Sources */, + AAB7E0182CC4B8C6000B8B6E /* container.cpp in Sources */, + 4F2FB1D52A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1DF2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4FB1F59120E4B011004157C8 /* IGraphicsMac_view.mm in Sources */, 4F7C4956255DDFC300DF7588 /* IPopupMenuControl.cpp in Sources */, 4F5C5F6B21BED08700E024A7 /* swell-appstub.mm in Sources */, @@ -3032,6 +3147,11 @@ 4F2FB1652A0047430027AB66 /* dsp.cpp in Sources */, 4F2FB1AB2A0047430027AB66 /* lstm.cpp in Sources */, 4F2FB1C02A0047430027AB66 /* wavenet.cpp in Sources */, + B1D2F7062D0000020027AB66 /* slimmable_wavenet.cpp in Sources */, + C2A2FAE182D0000120027AB66 /* a2_fast.cpp in Sources */, + AAB7E0192CC4B8C6000B8B6E /* container.cpp in Sources */, + 4F2FB1D62A0047430027AB66 /* conv1d.cpp in Sources */, + 4F2FB1E02A0047430027AB66 /* ring_buffer.cpp in Sources */, 4FFBB91F20863B0E00DDD0E7 /* vstparameters.cpp in Sources */, 4FFBB92120863B0E00DDD0E7 /* vstcomponentbase.cpp in Sources */, 4FFBB92220863B0E00DDD0E7 /* IPlugVST3_Processor.cpp in Sources */, diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj index 4763a404e..ec59513a1 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj @@ -1,455 +1,467 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - Tracer - Win32 - - - Tracer - x64 - - - - {079FC65A-F0E5-4E97-B318-A16D1D0B89DF} - NeuralAmpModeler - NeuralAmpModeler-vst3 - 10.0 - - - - DynamicLibrary - true - MultiByte - v143 - - - DynamicLibrary - true - MultiByte - v143 - - - DynamicLibrary - false - true - MultiByte - v143 - - - DynamicLibrary - false - true - MultiByte - v143 - - - DynamicLibrary - false - true - MultiByte - v143 - - - DynamicLibrary - false - true - MultiByte - v143 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ - - - .vst3 - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ - - .vst3 - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ - .vst3 - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ - .vst3 - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ - .vst3 - - - $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ - .vst3 - - - - Level3 - Disabled - $(VST3_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) - MultiThreadedDebug - $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) - - - Windows - %(AdditionalDependencies) - ..\..\VST3_SDK\base\win\$(Platform)\$(Configuration)\;$(WDL_PATH)\IPlug\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;$(WDL_PATH)\lice\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) - - - - - - Level3 - Disabled - $(VST3_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) - MultiThreadedDebug - $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) - - - Windows - %(AdditionalDependencies) - - - - - - Level3 - MaxSpeed - true - true - $(VST3_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) - true - Speed - $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) - - - true - true - Windows - %(AdditionalDependencies) - ..\..\VST3_SDK\base\win\$(Platform)\$(Configuration)\;$(WDL_PATH)\IPlug\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;$(WDL_PATH)\lice\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) - - - - - - Level3 - MaxSpeed - true - true - $(VST3_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) - true - Speed - $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) - - - true - true - Windows - %(AdditionalDependencies) - - - - - - Level3 - MaxSpeed - true - true - $(VST3_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) - true - $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) - - - true - true - Windows - %(AdditionalDependencies) - - - - - - Level3 - MaxSpeed - true - true - $(VST3_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) - true - $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) - - - true - true - Windows - $(x64_LIB_PATHS);$(WDL_PATH)\lice\$(SolutionDir)build-win\$(Platform)\Release\;..\..\VST3_SDK\base\win\$(Platform)\Release\;%(AdditionalLibraryDirectories) - %(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - $(IntDir)%(RelativeDir) - - - - - - - - - - - - - - - - Designer - - - - - - - - + + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Tracer + Win32 + + + Tracer + x64 + + + + {079FC65A-F0E5-4E97-B318-A16D1D0B89DF} + NeuralAmpModeler + NeuralAmpModeler-vst3 + 10.0 + + + + DynamicLibrary + true + MultiByte + v143 + + + DynamicLibrary + true + MultiByte + v143 + + + DynamicLibrary + false + true + MultiByte + v143 + + + DynamicLibrary + false + true + MultiByte + v143 + + + DynamicLibrary + false + true + MultiByte + v143 + + + DynamicLibrary + false + true + MultiByte + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ + + + .vst3 + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ + + .vst3 + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ + .vst3 + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ + .vst3 + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ + .vst3 + + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ + .vst3 + + + + Level3 + Disabled + $(VST3_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) + MultiThreadedDebug + $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) + + + Windows + %(AdditionalDependencies) + ..\..\VST3_SDK\base\win\$(Platform)\$(Configuration)\;$(WDL_PATH)\IPlug\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;$(WDL_PATH)\lice\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) + + + + + + Level3 + Disabled + $(VST3_DEFS);$(DEBUG_DEFS);$(EXTRA_DEBUG_DEFS);%(PreprocessorDefinitions) + MultiThreadedDebug + $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) + + + Windows + %(AdditionalDependencies) + + + + + + Level3 + MaxSpeed + true + true + $(VST3_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + true + Speed + $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) + + + true + true + Windows + %(AdditionalDependencies) + ..\..\VST3_SDK\base\win\$(Platform)\$(Configuration)\;$(WDL_PATH)\IPlug\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;$(WDL_PATH)\lice\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) + + + + + + Level3 + MaxSpeed + true + true + $(VST3_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + true + Speed + $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) + + + true + true + Windows + %(AdditionalDependencies) + + + + + + Level3 + MaxSpeed + true + true + $(VST3_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) + true + $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) + + + true + true + Windows + %(AdditionalDependencies) + + + + + + Level3 + MaxSpeed + true + true + $(VST3_DEFS);$(TRACER_DEFS);$(EXTRA_TRACER_DEFS);%(PreprocessorDefinitions) + true + $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) + + + true + true + Windows + $(x64_LIB_PATHS);$(WDL_PATH)\lice\$(SolutionDir)build-win\$(Platform)\Release\;..\..\VST3_SDK\base\win\$(Platform)\Release\;%(AdditionalLibraryDirectories) + %(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) + + + + + + + + + + + + + + + + + + + + Designer + + + + + + + + \ No newline at end of file diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index 846968710..a2c2e66ce 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit 846968710a670d662b15e449edba852d747d748e +Subproject commit a2c2e66ce2dd04636d700d8a890c43249033939f diff --git a/common-mac.xcconfig b/common-mac.xcconfig index fb1b2be53..efb6c582e 100644 --- a/common-mac.xcconfig +++ b/common-mac.xcconfig @@ -9,7 +9,7 @@ COMPILER = com.apple.compilers.llvm.clang.1_0 // which osx sdk to compile against - defaults to latest SDK available BASE_SDK_MAC = macosx // latest SDK -CLANG_CXX_LANGUAGE_STANDARD = c++17 +CLANG_CXX_LANGUAGE_STANDARD = c++20 CLANG_CXX_LIBRARY = libc++ CLANG_WARN_DOCUMENTATION_COMMENTS = NO diff --git a/common-win.props b/common-win.props index 3f4930f78..d4478742a 100644 --- a/common-win.props +++ b/common-win.props @@ -78,7 +78,7 @@ $(ALL_DEFS);%(PreprocessorDefinitions) 4996;4250;4018;4267;4068; $(WDL_PATH);$(IPLUG_PATH);$(SolutionDir);%(AdditionalIncludeDirectories) - stdcpp17 + stdcpp20 true