Improved: Moved common files from Visual C++ projects to separate project Common.

This commit is contained in:
jthedering committed 2017-06-18 12:51:26 +00:00
1 parent 6bfc9d4007
commit 6f1409419f
28 files changed
+546 -1053

No files matched your search

-2
View File
@@ -28,7 +28,6 @@
#include <string>
#include <sndfile.h>
#include <tclap/CmdLine.h>
#include <mpParser.h>
#include "version.h"
#include "FilterEngine.h"
@@ -38,7 +37,6 @@
#include "helpers/MemoryHelper.h"
using namespace std;
using namespace mup;
int main(int argc, char** argv)
{
+8 -90
View File
@@ -69,22 +69,22 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir);C:\Program Files\tclap-1.2.1\include;C:\Program Files\libsndfile\include;C:\Program Files\muparserx_v3_0_1\parser;C:\Program Files (x86)\fftw3;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir);C:\Program Files\tclap-1.2.1\include;C:\Program Files\libsndfile\include;$(IncludePath)</IncludePath>
<LibraryPath>C:\Program Files (x86)\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib;C:\Program Files (x86)\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir);C:\Program Files\tclap-1.2.1\include;C:\Program Files\libsndfile\include;C:\Program Files\muparserx_v3_0_1\parser;C:\Program Files\fftw3;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir);C:\Program Files\tclap-1.2.1\include;C:\Program Files\libsndfile\include;$(IncludePath)</IncludePath>
<LibraryPath>C:\Program Files\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib64;C:\Program Files\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir);C:\Program Files\tclap-1.2.1\include;C:\Program Files\libsndfile\include;C:\Program Files\muparserx_v3_0_1\parser;C:\Program Files (x86)\fftw3;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir);C:\Program Files\tclap-1.2.1\include;C:\Program Files\libsndfile\include;$(IncludePath)</IncludePath>
<LibraryPath>C:\Program Files (x86)\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib;C:\Program Files (x86)\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir);C:\Program Files\tclap-1.2.1\include;C:\Program Files\libsndfile\include;C:\Program Files\muparserx_v3_0_1\parser;C:\Program Files\fftw3;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir);C:\Program Files\tclap-1.2.1\include;C:\Program Files\libsndfile\include;$(IncludePath)</IncludePath>
<LibraryPath>C:\Program Files\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib64;C:\Program Files\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -97,7 +97,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>muparserxd.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(OutDir)Common.lib;muparserxd.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -110,7 +110,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>muparserxd.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(OutDir)Common.lib;muparserxd.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -128,7 +128,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>muparserx.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(OutDir)Common.lib;muparserx.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -146,50 +146,11 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>muparserx.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(OutDir)Common.lib;muparserx.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\FilterConfiguration.cpp" />
<ClCompile Include="..\FilterEngine.cpp" />
<ClCompile Include="..\filters\BiQuad.cpp" />
<ClCompile Include="..\filters\BiQuadFilter.cpp" />
<ClCompile Include="..\filters\BiQuadFilterFactory.cpp" />
<ClCompile Include="..\filters\ChannelFilter.cpp" />
<ClCompile Include="..\filters\ChannelFilterFactory.cpp" />
<ClCompile Include="..\filters\ConvolutionFilter.cpp" />
<ClCompile Include="..\filters\ConvolutionFilterFactory.cpp" />
<ClCompile Include="..\filters\CopyFilter.cpp" />
<ClCompile Include="..\filters\CopyFilterFactory.cpp" />
<ClCompile Include="..\filters\DelayFilter.cpp" />
<ClCompile Include="..\filters\DelayFilterFactory.cpp" />
<ClCompile Include="..\filters\DeviceFilterFactory.cpp" />
<ClCompile Include="..\filters\ExpressionFilterFactory.cpp" />
<ClCompile Include="..\filters\GraphicEQFilter.cpp" />
<ClCompile Include="..\filters\GraphicEQFilterFactory.cpp" />
<ClCompile Include="..\filters\IfFilterFactory.cpp" />
<ClCompile Include="..\filters\IIRFilter.cpp" />
<ClCompile Include="..\filters\IIRFilterFactory.cpp" />
<ClCompile Include="..\filters\IncludeFilterFactory.cpp" />
<ClCompile Include="..\filters\PreampFilter.cpp" />
<ClCompile Include="..\filters\PreampFilterFactory.cpp" />
<ClCompile Include="..\filters\StageFilterFactory.cpp" />
<ClCompile Include="..\filters\VSTPluginFilter.cpp" />
<ClCompile Include="..\filters\VSTPluginFilterFactory.cpp" />
<ClCompile Include="..\helpers\AbstractLibrary.cpp" />
<ClCompile Include="..\helpers\ChannelHelper.cpp" />
<ClCompile Include="..\helpers\GainIterator.cpp" />
<ClCompile Include="..\helpers\LogHelper.cpp" />
<ClCompile Include="..\helpers\MemoryHelper.cpp" />
<ClCompile Include="..\helpers\RegistryHelper.cpp" />
<ClCompile Include="..\helpers\StringHelper.cpp" />
<ClCompile Include="..\helpers\VSTPluginInstance.cpp" />
<ClCompile Include="..\helpers\VSTPluginLibrary.cpp" />
<ClCompile Include="..\IFilter.cpp" />
<ClCompile Include="..\libHybridConv-0.1.1\libHybridConv_eapo.cpp" />
<ClCompile Include="..\parser\RegexFunctions.cpp" />
<ClCompile Include="..\parser\RegistryFunctions.cpp" />
<ClCompile Include="..\parser\StringOperators.cpp" />
<ClCompile Include="..\stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -199,50 +160,7 @@
<ClCompile Include="Benchmark.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\FilterConfiguration.h" />
<ClInclude Include="..\FilterEngine.h" />
<ClInclude Include="..\filters\BiQuad.h" />
<ClInclude Include="..\filters\BiQuadFilter.h" />
<ClInclude Include="..\filters\BiQuadFilterFactory.h" />
<ClInclude Include="..\filters\ChannelFilter.h" />
<ClInclude Include="..\filters\ChannelFilterFactory.h" />
<ClInclude Include="..\filters\ConvolutionFilter.h" />
<ClInclude Include="..\filters\ConvolutionFilterFactory.h" />
<ClInclude Include="..\filters\CopyFilter.h" />
<ClInclude Include="..\filters\CopyFilterFactory.h" />
<ClInclude Include="..\filters\DelayFilter.h" />
<ClInclude Include="..\filters\DelayFilterFactory.h" />
<ClInclude Include="..\filters\DeviceFilterFactory.h" />
<ClInclude Include="..\filters\ExpressionFilterFactory.h" />
<ClInclude Include="..\filters\GraphicEQFilter.h" />
<ClInclude Include="..\filters\GraphicEQFilterFactory.h" />
<ClInclude Include="..\filters\IfFilterFactory.h" />
<ClInclude Include="..\filters\IIRFilter.h" />
<ClInclude Include="..\filters\IIRFilterFactory.h" />
<ClInclude Include="..\filters\IncludeFilterFactory.h" />
<ClInclude Include="..\filters\PreampFilter.h" />
<ClInclude Include="..\filters\PreampFilterFactory.h" />
<ClInclude Include="..\filters\StageFilterFactory.h" />
<ClInclude Include="..\filters\VSTPluginFilter.h" />
<ClInclude Include="..\filters\VSTPluginFilterFactory.h" />
<ClInclude Include="..\helpers\AbstractLibrary.h" />
<ClInclude Include="..\helpers\ChannelHelper.h" />
<ClInclude Include="..\helpers\GainIterator.h" />
<ClInclude Include="..\helpers\LogHelper.h" />
<ClInclude Include="..\helpers\MemoryHelper.h" />
<ClInclude Include="..\helpers\PrecisionTimer.h" />
<ClInclude Include="..\helpers\RegistryHelper.h" />
<ClInclude Include="..\helpers\ScopeGuard.h" />
<ClInclude Include="..\helpers\StringHelper.h" />
<ClInclude Include="..\helpers\UncaughtExceptions.h" />
<ClInclude Include="..\helpers\VSTPluginInstance.h" />
<ClInclude Include="..\helpers\VSTPluginLibrary.h" />
<ClInclude Include="..\IFilter.h" />
<ClInclude Include="..\IFilterFactory.h" />
<ClInclude Include="..\libHybridConv-0.1.1\libHybridConv_eapo.h" />
<ClInclude Include="..\parser\RegexFunctions.h" />
<ClInclude Include="..\parser\RegistryFunctions.h" />
<ClInclude Include="..\parser\StringOperators.h" />
<ClInclude Include="..\stdafx.h" />
</ItemGroup>
<ItemGroup>
+7 -248
View File
@@ -1,265 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\FilterEngine.cpp" />
<ClCompile Include="Benchmark.cpp" />
<ClCompile Include="..\FilterConfiguration.cpp" />
<ClCompile Include="..\IFilter.cpp" />
<ClCompile Include="..\parser\RegexFunctions.cpp">
<Filter>parser</Filter>
</ClCompile>
<ClCompile Include="..\parser\RegistryFunctions.cpp">
<Filter>parser</Filter>
</ClCompile>
<ClCompile Include="..\filters\BiQuad.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\BiQuadFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\BiQuadFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\ChannelFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\ChannelFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\CopyFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\CopyFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\DelayFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\DelayFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\DeviceFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\ExpressionFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\IncludeFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\PreampFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\PreampFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\StageFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\helpers\LogHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\stdafx.cpp" />
<ClCompile Include="..\helpers\MemoryHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\helpers\RegistryHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\helpers\StringHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\filters\IfFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\IIRFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\IIRFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\parser\StringOperators.cpp">
<Filter>parser</Filter>
</ClCompile>
<ClCompile Include="..\helpers\ChannelHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\filters\GraphicEQFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\GraphicEQFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\helpers\GainIterator.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\libHybridConv-0.1.1\libHybridConv_eapo.cpp">
<Filter>libHybridConv-0.1.1</Filter>
</ClCompile>
<ClCompile Include="..\filters\ConvolutionFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\ConvolutionFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\stdafx.cpp" />
<ClCompile Include="..\helpers\AbstractLibrary.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\filters\VSTPluginFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\VSTPluginFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\helpers\VSTPluginLibrary.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\helpers\VSTPluginInstance.cpp">
<Filter>helpers</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\FilterEngine.h" />
<ClInclude Include="..\FilterConfiguration.h" />
<ClInclude Include="..\IFilterFactory.h" />
<ClInclude Include="..\IFilter.h" />
<ClInclude Include="..\parser\RegexFunctions.h">
<Filter>parser</Filter>
</ClInclude>
<ClInclude Include="..\parser\RegistryFunctions.h">
<Filter>parser</Filter>
</ClInclude>
<ClInclude Include="..\filters\BiQuad.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\BiQuadFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\BiQuadFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\ChannelFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\ChannelFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\CopyFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\CopyFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\DelayFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\DelayFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\DeviceFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\ExpressionFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\IncludeFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\PreampFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\PreampFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\StageFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\helpers\LogHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\stdafx.h" />
<ClInclude Include="..\helpers\MemoryHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\PrecisionTimer.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\RegistryHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\StringHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\filters\IfFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\IIRFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\IIRFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\parser\StringOperators.h">
<Filter>parser</Filter>
</ClInclude>
<ClInclude Include="..\helpers\ChannelHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\filters\GraphicEQFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\GraphicEQFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\helpers\GainIterator.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\libHybridConv-0.1.1\libHybridConv_eapo.h">
<Filter>libHybridConv-0.1.1</Filter>
</ClInclude>
<ClInclude Include="..\filters\ConvolutionFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\ConvolutionFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\stdafx.h" />
<ClInclude Include="..\helpers\ScopeGuard.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\UncaughtExceptions.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\AbstractLibrary.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\filters\VSTPluginFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\VSTPluginFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\helpers\VSTPluginLibrary.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\VSTPluginInstance.h">
<Filter>helpers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="parser">
<UniqueIdentifier>{af133437-31da-454b-abde-b62ce82af9b1}</UniqueIdentifier>
</Filter>
<Filter Include="filters">
<UniqueIdentifier>{80c1c047-44e8-49fc-81d6-349c41e979a7}</UniqueIdentifier>
</Filter>
<Filter Include="helpers">
<UniqueIdentifier>{4bf76d90-8b50-493a-848b-019f88fa1f11}</UniqueIdentifier>
</Filter>
<Filter Include="libHybridConv-0.1.1">
<UniqueIdentifier>{35b3b6f1-e4df-4214-bd4c-fa058942e547}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="..\EqualizerAPO.licenseheader" />
</ItemGroup>
<ItemGroup>
<Filter Include="helpers">
<UniqueIdentifier>{8c70f87a-7d86-4826-bfa1-7a4c4ec5efec}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>
+18 -68
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -19,39 +19,36 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}</ProjectGuid>
<ProjectGuid>{6758B50E-B9F0-4389-A61D-A842F0545E1B}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>EqualizerAPO</RootNamespace>
<WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
<RootNamespace>Common</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<UseOfAtl>false</UseOfAtl>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<UseOfAtl>false</UseOfAtl>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -70,58 +67,40 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir);$(IncludePath);C:\Program Files\libsndfile\include;C:\Program Files\muparserx_v3_0_1\parser;C:\Program Files (x86)\fftw3</IncludePath>
<LibraryPath>C:\Program Files (x86)\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib;C:\Program Files (x86)\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir);$(IncludePath);C:\Program Files\libsndfile\include;C:\Program Files\muparserx_v3_0_1\parser;C:\Program Files\fftw3</IncludePath>
<LibraryPath>C:\Program Files\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib64;C:\Program Files\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir);$(IncludePath);C:\Program Files\libsndfile\include;C:\Program Files\muparserx_v3_0_1\parser;C:\Program Files (x86)\fftw3</IncludePath>
<LibraryPath>C:\Program Files (x86)\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib;C:\Program Files (x86)\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir);$(IncludePath);C:\Program Files\libsndfile\include;C:\Program Files\muparserx_v3_0_1\parser;C:\Program Files\fftw3</IncludePath>
<LibraryPath>C:\Program Files\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib64;C:\Program Files\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;USE_WINDDK;_DEBUG;_WINDOWS;_USRDLL;EQUALIZERAPO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>muparserxd.lib;audioeng.lib;version.lib;wmcodecdspuuid.lib;AudioBaseProcessingObject.lib;audiomediatypecrt.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>EqualizerAPO.def</ModuleDefinitionFile>
</Link>
<Midl>
<TypeLibraryName>$(ProjectName).tlb</TypeLibraryName>
</Midl>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;USE_WINDDK;_DEBUG;_WINDOWS;_USRDLL;EQUALIZERAPO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>muparserxd.lib;audioeng.lib;version.lib;wmcodecdspuuid.lib;AudioBaseProcessingObject.lib;audiomediatypecrt.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>EqualizerAPO.def</ModuleDefinitionFile>
</Link>
<Midl>
<TypeLibraryName>$(ProjectName).tlb</TypeLibraryName>
</Midl>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -130,16 +109,13 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;USE_WINDDK;NDEBUG;_WINDOWS;_USRDLL;EQUALIZERAPO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FloatingPointModel>Fast</FloatingPointModel>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>muparserx.lib;audioeng.lib;version.lib;wmcodecdspuuid.lib;AudioBaseProcessingObject.lib;audiomediatypecrt.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>EqualizerAPO.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -149,23 +125,18 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;USE_WINDDK;NDEBUG;_WINDOWS;_USRDLL;EQUALIZERAPO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FloatingPointModel>Fast</FloatingPointModel>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>muparserx.lib;audioeng.lib;version.lib;wmcodecdspuuid.lib;AudioBaseProcessingObject.lib;audiomediatypecrt.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>EqualizerAPO.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="AbstractAPOInfo.h" />
<ClInclude Include="ClassFactory.h" />
<ClInclude Include="DeviceAPOInfo.h" />
<ClInclude Include="EqualizerAPO.h" />
<ClInclude Include="FilterConfiguration.h" />
<ClInclude Include="FilterEngine.h" />
<ClInclude Include="filters\BiQuad.h" />
@@ -197,7 +168,6 @@
<ClInclude Include="helpers\ChannelHelper.h" />
<ClInclude Include="helpers\GainIterator.h" />
<ClInclude Include="helpers\LogHelper.h" />
<ClInclude Include="helpers\MemoryHelper.h" />
<ClInclude Include="helpers\PrecisionTimer.h" />
<ClInclude Include="helpers\RegistryHelper.h" />
<ClInclude Include="helpers\ScopeGuard.h" />
@@ -211,17 +181,12 @@
<ClInclude Include="parser\RegexFunctions.h" />
<ClInclude Include="parser\RegistryFunctions.h" />
<ClInclude Include="parser\StringOperators.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="version.h" />
<ClInclude Include="VoicemeeterAPOInfo.h" />
<ClInclude Include="stdafx.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="AbstractAPOInfo.cpp" />
<ClCompile Include="ClassFactory.cpp" />
<ClCompile Include="DeviceAPOInfo.cpp" />
<ClCompile Include="DllMain.cpp" />
<ClCompile Include="EqualizerAPO.cpp" />
<ClCompile Include="FilterConfiguration.cpp" />
<ClCompile Include="FilterEngine.cpp" />
<ClCompile Include="filters\BiQuad.cpp" />
@@ -252,7 +217,6 @@
<ClCompile Include="helpers\ChannelHelper.cpp" />
<ClCompile Include="helpers\GainIterator.cpp" />
<ClCompile Include="helpers\LogHelper.cpp" />
<ClCompile Include="helpers\MemoryHelper.cpp" />
<ClCompile Include="helpers\RegistryHelper.cpp" />
<ClCompile Include="helpers\StringHelper.cpp" />
<ClCompile Include="helpers\VSTPluginInstance.cpp" />
@@ -262,27 +226,13 @@
<ClCompile Include="parser\RegexFunctions.cpp" />
<ClCompile Include="parser\RegistryFunctions.cpp" />
<ClCompile Include="parser\StringOperators.cpp" />
<ClCompile Include="VoicemeeterAPOInfo.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="VoicemeeterAPOInfo.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="EqualizerAPO.def" />
<None Include="EqualizerAPO.licenseheader" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="EqualizerAPO.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ResourceCompile>
<ResourceCompile Include="EqualizerAPO64.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ResourceCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
@@ -1,144 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="ClassFactory.cpp" />
<ClCompile Include="DeviceAPOInfo.cpp" />
<ClCompile Include="DllMain.cpp" />
<ClCompile Include="EqualizerAPO.cpp" />
<ClCompile Include="FilterEngine.cpp" />
<ClCompile Include="FilterConfiguration.cpp" />
<ClCompile Include="IFilter.cpp" />
<ClCompile Include="parser\RegexFunctions.cpp">
<Filter>parser</Filter>
</ClCompile>
<ClCompile Include="parser\RegistryFunctions.cpp">
<Filter>parser</Filter>
</ClCompile>
<ClCompile Include="filters\BiQuad.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\BiQuadFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\BiQuadFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\ChannelFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\ChannelFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\CopyFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\CopyFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\DelayFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\DelayFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\DeviceFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\ExpressionFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\IncludeFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\PreampFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\PreampFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\StageFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="helpers\LogHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="helpers\MemoryHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="helpers\RegistryHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="helpers\StringHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="filters\IfFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\IIRFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\IIRFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="parser\StringOperators.cpp">
<Filter>parser</Filter>
</ClCompile>
<ClCompile Include="helpers\ChannelHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="filters\GraphicEQFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\GraphicEQFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="helpers\GainIterator.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="libHybridConv-0.1.1\libHybridConv_eapo.cpp">
<Filter>libHybridConv-0.1.1</Filter>
</ClCompile>
<ClCompile Include="filters\ConvolutionFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\ConvolutionFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="stdafx.cpp" />
<ClCompile Include="AbstractAPOInfo.cpp" />
<ClCompile Include="VoicemeeterAPOInfo.cpp" />
<ClCompile Include="helpers\AbstractLibrary.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="filters\VSTPluginFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\VSTPluginFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="helpers\VSTPluginLibrary.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="helpers\VSTPluginInstance.cpp">
<Filter>helpers</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="ClassFactory.h" />
<ClInclude Include="DeviceAPOInfo.h" />
<ClInclude Include="EqualizerAPO.h" />
<ClInclude Include="FilterEngine.h" />
<ClInclude Include="IFilter.h" />
<ClInclude Include="IFilterFactory.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="version.h" />
<ClInclude Include="FilterConfiguration.h" />
<ClInclude Include="parser\RegexFunctions.h">
<Filter>parser</Filter>
</ClInclude>
<ClInclude Include="parser\RegistryFunctions.h">
<Filter>parser</Filter>
</ClInclude>
<ClInclude Include="stdafx.h" />
<ClInclude Include="filters\BiQuad.h">
<Filter>filters</Filter>
</ClInclude>
@@ -154,6 +17,12 @@
<ClInclude Include="filters\ChannelFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="filters\ConvolutionFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="filters\ConvolutionFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="filters\CopyFilter.h">
<Filter>filters</Filter>
</ClInclude>
@@ -172,6 +41,21 @@
<ClInclude Include="filters\ExpressionFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="filters\GraphicEQFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="filters\GraphicEQFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="filters\IfFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="filters\IIRFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="filters\IIRFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="filters\IncludeFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
@@ -184,10 +68,25 @@
<ClInclude Include="filters\StageFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="helpers\LogHelper.h">
<ClInclude Include="filters\VSTPluginFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="filters\VSTPluginFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="helpers\AbstractLibrary.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="helpers\MemoryHelper.h">
<ClInclude Include="helpers\aeffectx.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="helpers\ChannelHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="helpers\GainIterator.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="helpers\LogHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="helpers\PrecisionTimer.h">
@@ -196,90 +95,170 @@
<ClInclude Include="helpers\RegistryHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="helpers\StringHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="filters\IfFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="filters\IIRFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="filters\IIRFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="parser\StringOperators.h">
<Filter>parser</Filter>
</ClInclude>
<ClInclude Include="helpers\ChannelHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="filters\GraphicEQFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="filters\GraphicEQFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="helpers\GainIterator.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="libHybridConv-0.1.1\libHybridConv_eapo.h">
<Filter>libHybridConv-0.1.1</Filter>
</ClInclude>
<ClInclude Include="filters\ConvolutionFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="filters\ConvolutionFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="stdafx.h" />
<ClInclude Include="AbstractAPOInfo.h" />
<ClInclude Include="helpers\ScopeGuard.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="helpers\StringHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="helpers\UncaughtExceptions.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="VoicemeeterAPOInfo.h" />
<ClInclude Include="helpers\AbstractLibrary.h">
<ClInclude Include="helpers\VSTPluginInstance.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="helpers\aeffectx.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="filters\VSTPluginFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="filters\VSTPluginFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="helpers\VSTPluginLibrary.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="helpers\VSTPluginInstance.h">
<Filter>helpers</Filter>
<ClInclude Include="libHybridConv-0.1.1\libHybridConv_eapo.h">
<Filter>libHybridConv-0.1.1</Filter>
</ClInclude>
<ClInclude Include="parser\RegexFunctions.h">
<Filter>parser</Filter>
</ClInclude>
<ClInclude Include="parser\RegistryFunctions.h">
<Filter>parser</Filter>
</ClInclude>
<ClInclude Include="parser\StringOperators.h">
<Filter>parser</Filter>
</ClInclude>
<ClInclude Include="VoicemeeterAPOInfo.h" />
<ClInclude Include="AbstractAPOInfo.h" />
<ClInclude Include="DeviceAPOInfo.h" />
<ClInclude Include="FilterConfiguration.h" />
<ClInclude Include="FilterEngine.h" />
<ClInclude Include="IFilter.h" />
<ClInclude Include="IFilterFactory.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="EqualizerAPO.rc" />
<ResourceCompile Include="EqualizerAPO64.rc" />
</ItemGroup>
<ItemGroup>
<None Include="EqualizerAPO.def" />
<None Include="EqualizerAPO.licenseheader" />
<ClCompile Include="stdafx.cpp" />
<ClCompile Include="filters\BiQuad.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\BiQuadFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\BiQuadFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\ChannelFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\ChannelFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\ConvolutionFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\ConvolutionFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\CopyFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\CopyFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\DelayFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\DelayFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\DeviceFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\ExpressionFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\GraphicEQFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\GraphicEQFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\IfFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\IIRFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\IIRFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\IncludeFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\PreampFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\PreampFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\StageFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\VSTPluginFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="filters\VSTPluginFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="helpers\AbstractLibrary.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="helpers\ChannelHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="helpers\GainIterator.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="helpers\LogHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="helpers\RegistryHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="helpers\StringHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="helpers\VSTPluginInstance.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="helpers\VSTPluginLibrary.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="libHybridConv-0.1.1\libHybridConv_eapo.cpp">
<Filter>libHybridConv-0.1.1</Filter>
</ClCompile>
<ClCompile Include="parser\RegexFunctions.cpp">
<Filter>parser</Filter>
</ClCompile>
<ClCompile Include="parser\RegistryFunctions.cpp">
<Filter>parser</Filter>
</ClCompile>
<ClCompile Include="parser\StringOperators.cpp">
<Filter>parser</Filter>
</ClCompile>
<ClCompile Include="VoicemeeterAPOInfo.cpp" />
<ClCompile Include="AbstractAPOInfo.cpp" />
<ClCompile Include="DeviceAPOInfo.cpp" />
<ClCompile Include="FilterConfiguration.cpp" />
<ClCompile Include="FilterEngine.cpp" />
<ClCompile Include="IFilter.cpp" />
</ItemGroup>
<ItemGroup>
<Filter Include="filters">
<UniqueIdentifier>{d8adcbe6-a53a-44e1-93fd-272b6e8983fb}</UniqueIdentifier>
<UniqueIdentifier>{b8ae5fab-edba-40a4-b387-18079935b5ba}</UniqueIdentifier>
</Filter>
<Filter Include="helpers">
<UniqueIdentifier>{792503e3-923f-4123-808f-5acbf7da01fe}</UniqueIdentifier>
</Filter>
<Filter Include="parser">
<UniqueIdentifier>{df98049b-1ada-41ad-a5ab-0a175600a767}</UniqueIdentifier>
<UniqueIdentifier>{25ac0a12-b62f-4862-90ba-30f97623714b}</UniqueIdentifier>
</Filter>
<Filter Include="libHybridConv-0.1.1">
<UniqueIdentifier>{f4e10c18-382a-4262-9d1b-308f65c34af3}</UniqueIdentifier>
<UniqueIdentifier>{4c157803-cb45-40b5-b4d5-25bf8dbcc6e6}</UniqueIdentifier>
</Filter>
<Filter Include="parser">
<UniqueIdentifier>{4a6738bc-7359-4b18-bdb4-1f443f41e528}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>
+12 -27
View File
@@ -19,34 +19,19 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\AbstractAPOInfo.h" />
<ClInclude Include="..\DeviceAPOInfo.h" />
<ClInclude Include="..\helpers\LogHelper.h" />
<ClInclude Include="..\helpers\MemoryHelper.h" />
<ClInclude Include="..\helpers\PrecisionTimer.h" />
<ClInclude Include="..\helpers\RegistryHelper.h" />
<ClInclude Include="..\helpers\ScopeGuard.h" />
<ClInclude Include="..\helpers\StringHelper.h" />
<ClInclude Include="..\helpers\UncaughtExceptions.h" />
<ClInclude Include="..\stdafx.h" />
<ClInclude Include="..\VoicemeeterAPOInfo.h" />
<ClInclude Include="Configurator.h" />
<ClInclude Include="Resource.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\AbstractAPOInfo.cpp" />
<ClCompile Include="..\DeviceAPOInfo.cpp" />
<ClCompile Include="..\helpers\LogHelper.cpp" />
<ClCompile Include="..\helpers\MemoryHelper.cpp" />
<ClCompile Include="..\helpers\RegistryHelper.cpp" />
<ClCompile Include="..\helpers\StringHelper.cpp" />
<ClCompile Include="..\stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\VoicemeeterAPOInfo.cpp" />
<ClCompile Include="Configurator.cpp" />
</ItemGroup>
<ItemGroup>
@@ -113,27 +98,27 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir);$(IncludePath);$(DDK_PATH)\inc\api</IncludePath>
<IncludePath>$(SolutionDir);$(IncludePath)</IncludePath>
<GenerateManifest>false</GenerateManifest>
<LibraryPath>$(LibraryPath);$(DDK_PATH)\lib\win7\i386</LibraryPath>
<LibraryPath>$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir);$(IncludePath);$(DDK_PATH)\inc\api</IncludePath>
<IncludePath>$(SolutionDir);$(IncludePath)</IncludePath>
<GenerateManifest>false</GenerateManifest>
<LibraryPath>$(LibraryPath);$(DDK_PATH)\lib\win7\amd64</LibraryPath>
<LibraryPath>$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir);$(IncludePath);$(DDK_PATH)\inc\api</IncludePath>
<IncludePath>$(SolutionDir);$(IncludePath)</IncludePath>
<GenerateManifest>false</GenerateManifest>
<LibraryPath>$(LibraryPath);$(DDK_PATH)\lib\win7\i386</LibraryPath>
<LibraryPath>$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir);$(IncludePath);$(DDK_PATH)\inc\api</IncludePath>
<IncludePath>$(SolutionDir);$(IncludePath)</IncludePath>
<GenerateManifest>false</GenerateManifest>
<LibraryPath>$(LibraryPath);$(DDK_PATH)\lib\win7\amd64</LibraryPath>
<LibraryPath>$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -145,7 +130,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>audioeng.lib;version.lib;Shlwapi.lib;authz.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(OutDir)Common.lib;audioeng.lib;version.lib;Shlwapi.lib;authz.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -158,7 +143,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>audioeng.lib;version.lib;Shlwapi.lib;authz.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(OutDir)Common.lib;audioeng.lib;version.lib;Shlwapi.lib;authz.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -175,7 +160,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>audioeng.lib;version.lib;Shlwapi.lib;authz.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(OutDir)Common.lib;audioeng.lib;version.lib;Shlwapi.lib;authz.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -192,7 +177,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>audioeng.lib;version.lib;Shlwapi.lib;authz.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(OutDir)Common.lib;audioeng.lib;version.lib;Shlwapi.lib;authz.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+1 -34
View File
@@ -1,52 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\DeviceAPOInfo.cpp" />
<ClCompile Include="Configurator.cpp" />
<ClCompile Include="..\helpers\LogHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\stdafx.cpp" />
<ClCompile Include="..\helpers\MemoryHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\helpers\RegistryHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\stdafx.cpp" />
<ClCompile Include="..\helpers\StringHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\AbstractAPOInfo.cpp" />
<ClCompile Include="..\VoicemeeterAPOInfo.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\DeviceAPOInfo.h" />
<ClInclude Include="Configurator.h" />
<ClInclude Include="Resource.h" />
<ClInclude Include="..\helpers\LogHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\MemoryHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\PrecisionTimer.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\RegistryHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\stdafx.h" />
<ClInclude Include="..\helpers\StringHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\AbstractAPOInfo.h" />
<ClInclude Include="..\VoicemeeterAPOInfo.h" />
<ClInclude Include="..\helpers\ScopeGuard.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\UncaughtExceptions.h">
<Filter>helpers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Configurator.rc" />
+30 -11
View File
@@ -3,16 +3,27 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EqualizerAPO", "EqualizerAPO.vcxproj", "{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Configurator", "Configurator\Configurator.vcxproj", "{E18E1CA7-3D6C-4CD5-9CE9-E72565A206E5}"
ProjectSection(ProjectDependencies) = postProject
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649} = {5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}
{6758B50E-B9F0-4389-A61D-A842F0545E1B} = {6758B50E-B9F0-4389-A61D-A842F0545E1B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benchmark.vcxproj", "{D4474852-5724-4253-95C6-7A6DC424F194}"
ProjectSection(ProjectDependencies) = postProject
{6758B50E-B9F0-4389-A61D-A842F0545E1B} = {6758B50E-B9F0-4389-A61D-A842F0545E1B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoicemeeterClient", "VoicemeeterClient\VoicemeeterClient.vcxproj", "{10F1DD37-EA50-46C2-810D-D01A1A0D4D2F}"
ProjectSection(ProjectDependencies) = postProject
{6758B50E-B9F0-4389-A61D-A842F0545E1B} = {6758B50E-B9F0-4389-A61D-A842F0545E1B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common.vcxproj", "{6758B50E-B9F0-4389-A61D-A842F0545E1B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EqualizerAPO", "EqualizerAPO\EqualizerAPO.vcxproj", "{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}"
ProjectSection(ProjectDependencies) = postProject
{6758B50E-B9F0-4389-A61D-A842F0545E1B} = {6758B50E-B9F0-4389-A61D-A842F0545E1B}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -22,14 +33,6 @@ Global
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Debug|Win32.ActiveCfg = Debug|Win32
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Debug|Win32.Build.0 = Debug|Win32
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Debug|x64.ActiveCfg = Debug|x64
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Debug|x64.Build.0 = Debug|x64
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Release|Win32.ActiveCfg = Release|Win32
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Release|Win32.Build.0 = Release|Win32
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Release|x64.ActiveCfg = Release|x64
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Release|x64.Build.0 = Release|x64
{E18E1CA7-3D6C-4CD5-9CE9-E72565A206E5}.Debug|Win32.ActiveCfg = Debug|Win32
{E18E1CA7-3D6C-4CD5-9CE9-E72565A206E5}.Debug|Win32.Build.0 = Debug|Win32
{E18E1CA7-3D6C-4CD5-9CE9-E72565A206E5}.Debug|x64.ActiveCfg = Debug|x64
@@ -54,6 +57,22 @@ Global
{10F1DD37-EA50-46C2-810D-D01A1A0D4D2F}.Release|Win32.Build.0 = Release|Win32
{10F1DD37-EA50-46C2-810D-D01A1A0D4D2F}.Release|x64.ActiveCfg = Release|x64
{10F1DD37-EA50-46C2-810D-D01A1A0D4D2F}.Release|x64.Build.0 = Release|x64
{6758B50E-B9F0-4389-A61D-A842F0545E1B}.Debug|Win32.ActiveCfg = Debug|Win32
{6758B50E-B9F0-4389-A61D-A842F0545E1B}.Debug|Win32.Build.0 = Debug|Win32
{6758B50E-B9F0-4389-A61D-A842F0545E1B}.Debug|x64.ActiveCfg = Debug|x64
{6758B50E-B9F0-4389-A61D-A842F0545E1B}.Debug|x64.Build.0 = Debug|x64
{6758B50E-B9F0-4389-A61D-A842F0545E1B}.Release|Win32.ActiveCfg = Release|Win32
{6758B50E-B9F0-4389-A61D-A842F0545E1B}.Release|Win32.Build.0 = Release|Win32
{6758B50E-B9F0-4389-A61D-A842F0545E1B}.Release|x64.ActiveCfg = Release|x64
{6758B50E-B9F0-4389-A61D-A842F0545E1B}.Release|x64.Build.0 = Release|x64
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Debug|Win32.ActiveCfg = Debug|Win32
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Debug|Win32.Build.0 = Debug|Win32
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Debug|x64.ActiveCfg = Debug|x64
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Debug|x64.Build.0 = Debug|x64
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Release|Win32.ActiveCfg = Release|Win32
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Release|Win32.Build.0 = Release|Win32
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Release|x64.ActiveCfg = Release|x64
{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+201
View File
@@ -0,0 +1,201 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{5AF4EE2B-CC80-4AE5-A786-86FACC0CC649}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>EqualizerAPO</RootNamespace>
<WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<UseOfAtl>false</UseOfAtl>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<UseOfAtl>false</UseOfAtl>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir);$(IncludePath)</IncludePath>
<LibraryPath>C:\Program Files (x86)\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib;C:\Program Files (x86)\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir);$(IncludePath)</IncludePath>
<LibraryPath>C:\Program Files\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib64;C:\Program Files\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir);$(IncludePath)</IncludePath>
<LibraryPath>C:\Program Files (x86)\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib;C:\Program Files (x86)\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir);$(IncludePath)</IncludePath>
<LibraryPath>C:\Program Files\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib64;C:\Program Files\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;USE_WINDDK;_DEBUG;_WINDOWS;_USRDLL;EQUALIZERAPO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(OutDir)Common.lib;muparserxd.lib;audioeng.lib;version.lib;wmcodecdspuuid.lib;AudioBaseProcessingObject.lib;audiomediatypecrt.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>EqualizerAPO.def</ModuleDefinitionFile>
</Link>
<Midl>
<TypeLibraryName>$(ProjectName).tlb</TypeLibraryName>
</Midl>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;USE_WINDDK;_DEBUG;_WINDOWS;_USRDLL;EQUALIZERAPO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(OutDir)Common.lib;muparserxd.lib;audioeng.lib;version.lib;wmcodecdspuuid.lib;AudioBaseProcessingObject.lib;audiomediatypecrt.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>EqualizerAPO.def</ModuleDefinitionFile>
</Link>
<Midl>
<TypeLibraryName>$(ProjectName).tlb</TypeLibraryName>
</Midl>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;USE_WINDDK;NDEBUG;_WINDOWS;_USRDLL;EQUALIZERAPO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>$(OutDir)Common.lib;muparserx.lib;audioeng.lib;version.lib;wmcodecdspuuid.lib;AudioBaseProcessingObject.lib;audiomediatypecrt.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>EqualizerAPO.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;USE_WINDDK;NDEBUG;_WINDOWS;_USRDLL;EQUALIZERAPO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>$(OutDir)Common.lib;muparserx.lib;audioeng.lib;version.lib;wmcodecdspuuid.lib;AudioBaseProcessingObject.lib;audiomediatypecrt.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>EqualizerAPO.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\helpers\MemoryHelper.h" />
<ClInclude Include="..\stdafx.h" />
<ClInclude Include="..\version.h" />
<ClInclude Include="ClassFactory.h" />
<ClInclude Include="EqualizerAPO.h" />
<ClInclude Include="resource.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\helpers\MemoryHelper.cpp" />
<ClCompile Include="..\stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="ClassFactory.cpp" />
<ClCompile Include="DllMain.cpp" />
<ClCompile Include="EqualizerAPO.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="EqualizerAPO.def" />
<None Include="EqualizerAPO.licenseheader" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="EqualizerAPO.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ResourceCompile>
<ResourceCompile Include="EqualizerAPO64.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ResourceCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
+35
View File
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="ClassFactory.cpp" />
<ClCompile Include="DllMain.cpp" />
<ClCompile Include="EqualizerAPO.cpp" />
<ClCompile Include="..\helpers\MemoryHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\stdafx.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="ClassFactory.h" />
<ClInclude Include="EqualizerAPO.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="..\helpers\MemoryHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\stdafx.h" />
<ClInclude Include="..\version.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="EqualizerAPO.rc" />
<ResourceCompile Include="EqualizerAPO64.rc" />
</ItemGroup>
<ItemGroup>
<None Include="EqualizerAPO.def" />
<None Include="EqualizerAPO.licenseheader" />
</ItemGroup>
<ItemGroup>
<Filter Include="helpers">
<UniqueIdentifier>{95612e70-aead-4faa-bcfe-525a3c68d8ec}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>
File renamed without changes.
File renamed without changes.
+14 -11
View File
@@ -29,6 +29,7 @@
#include <Shlwapi.h>
#include <Ks.h>
#include <KsMedia.h>
#include <mpParser.h>
#include <mpPackageCommon.h>
#include <mpPackageNonCmplx.h>
#include <mpPackageStr.h>
@@ -73,7 +74,8 @@ FilterEngine::FilterEngine()
transitionCounter = 0;
InitializeCriticalSection(&loadSection);
loadSemaphore = CreateSemaphore(NULL, 1, 1, NULL);
parser.EnableAutoCreateVar(true);
parser = new ParserX();
parser->EnableAutoCreateVar(true);
factories.push_back(new DeviceFilterFactory());
factories.push_back(new IfFilterFactory());
@@ -111,6 +113,7 @@ FilterEngine::~FilterEngine()
for (vector<IFilterFactory*>::iterator it = factories.begin(); it != factories.end(); it++)
delete*it;
delete parser;
CloseHandle(loadSemaphore);
DeleteCriticalSection(&loadSection);
}
@@ -169,15 +172,15 @@ void FilterEngine::initialize(float sampleRate, unsigned inputChannelCount, unsi
return;
}
parser.ClearConst();
parser.ClearFun();
parser.ClearInfixOprt();
parser.ClearOprt();
parser.ClearPostfixOprt();
parser.AddPackage(PackageCommon::Instance());
parser.AddPackage(PackageNonCmplx::Instance());
parser.AddPackage(PackageStr::Instance());
parser.AddPackage(PackageMatrix::Instance());
parser->ClearConst();
parser->ClearFun();
parser->ClearInfixOprt();
parser->ClearOprt();
parser->ClearPostfixOprt();
parser->AddPackage(PackageCommon::Instance());
parser->AddPackage(PackageNonCmplx::Instance());
parser->AddPackage(PackageStr::Instance());
parser->AddPackage(PackageMatrix::Instance());
for (vector<IFilterFactory*>::const_iterator it = factories.cbegin(); it != factories.cend(); it++)
{
@@ -219,7 +222,7 @@ void FilterEngine::loadConfig(const wstring& customPath)
lastChannelNames.clear();
lastNewChannelNames.clear();
watchRegistryKeys.clear();
parser.ClearVar();
parser->ClearVar();
for (vector<IFilterFactory*>::const_iterator it = factories.cbegin(); it != factories.cend(); it++)
{
+6 -3
View File
@@ -24,13 +24,16 @@
#include <unordered_set>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <mpParser.h>
#include "IFilterFactory.h"
#include "FilterConfiguration.h"
#include "helpers/PrecisionTimer.h"
#include "helpers/MemoryHelper.h"
namespace mup {
class ParserX;
}
#pragma AVRT_VTABLES_BEGIN
class FilterEngine
{
@@ -60,7 +63,7 @@ public:
unsigned getChannelMask() const {return channelMask;}
float getSampleRate() const {return sampleRate;}
unsigned getMaxFrameCount() const {return maxFrameCount;}
mup::ParserX* getParser() {return &parser;}
mup::ParserX* getParser() {return parser;}
private:
void addFilters(std::vector<IFilter*> filters);
@@ -93,7 +96,7 @@ private:
std::vector<std::wstring> lastNewChannelNames;
std::vector<std::wstring> allChannelNames;
bool lastInPlace;
mup::ParserX parser;
mup::ParserX* parser;
FilterConfiguration* currentConfig;
FilterConfiguration* nextConfig;
+13 -13
View File
@@ -1,20 +1,20 @@
/*
This file is part of EqualizerAPO, a system-wide equalizer.
Copyright (C) 2017 Jonas Thedering
This file is part of EqualizerAPO, a system-wide equalizer.
Copyright (C) 2017 Jonas Thedering
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#pragma once
+2 -2
View File
@@ -218,9 +218,9 @@ void VoicemeeterClient::handle(long nCommand, void* lpData, long nnn)
VBVMR_LPT_AUDIOBUFFER audioBuffer = (VBVMR_LPT_AUDIOBUFFER)lpData;
int nbi = audioBuffer->audiobuffer_nbi;
int nbo = audioBuffer->audiobuffer_nbo;
int n = min(nbi, nbo) / 8;
unsigned n = min(nbi, nbo) / 8;
for (int i = 0; i < n; i++)
for (unsigned i = 0; i < n; i++)
{
FilterEngine* engine = NULL;
if (i < engines.size())
+8 -93
View File
@@ -68,22 +68,22 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir);C:\Program Files\libsndfile\include;C:\Program Files\muparserx_v3_0_1\parser;C:\Program Files (x86)\fftw3;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir);$(IncludePath)</IncludePath>
<LibraryPath>C:\Program Files (x86)\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib;C:\Program Files (x86)\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir);C:\Program Files\libsndfile\include;C:\Program Files\muparserx_v3_0_1\parser;C:\Program Files\fftw3;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir);$(IncludePath)</IncludePath>
<LibraryPath>C:\Program Files\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib64;C:\Program Files\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir);C:\Program Files\libsndfile\include;C:\Program Files\muparserx_v3_0_1\parser;C:\Program Files (x86)\fftw3;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir);$(IncludePath)</IncludePath>
<LibraryPath>C:\Program Files (x86)\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib;C:\Program Files (x86)\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir);C:\Program Files\libsndfile\include;C:\Program Files\muparserx_v3_0_1\parser;C:\Program Files\fftw3;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir);$(IncludePath)</IncludePath>
<LibraryPath>C:\Program Files\libsndfile\lib;C:\Program Files\muparserx_v3_0_1\lib64;C:\Program Files\fftw3;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -96,7 +96,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>muparserxd.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(OutDir)Common.lib;muparserxd.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -109,7 +109,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>muparserxd.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(OutDir)Common.lib;muparserxd.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -127,7 +127,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>muparserx.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(OutDir)Common.lib;muparserx.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -145,109 +145,24 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>muparserx.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(OutDir)Common.lib;muparserx.lib;version.lib;Shlwapi.lib;authz.lib;crypt32.lib;dbghelp.lib;libsndfile-1.lib;libfftw3f-3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\..\Users\Jonas\Downloads\VoicemeeterRemoteAPI_Pack6\VoicemeeterRemote.h" />
<ClInclude Include="..\AbstractAPOInfo.h" />
<ClInclude Include="..\FilterConfiguration.h" />
<ClInclude Include="..\FilterEngine.h" />
<ClInclude Include="..\filters\BiQuad.h" />
<ClInclude Include="..\filters\BiQuadFilter.h" />
<ClInclude Include="..\filters\BiQuadFilterFactory.h" />
<ClInclude Include="..\filters\ChannelFilter.h" />
<ClInclude Include="..\filters\ChannelFilterFactory.h" />
<ClInclude Include="..\filters\ConvolutionFilter.h" />
<ClInclude Include="..\filters\ConvolutionFilterFactory.h" />
<ClInclude Include="..\filters\CopyFilter.h" />
<ClInclude Include="..\filters\CopyFilterFactory.h" />
<ClInclude Include="..\filters\DelayFilter.h" />
<ClInclude Include="..\filters\DelayFilterFactory.h" />
<ClInclude Include="..\filters\DeviceFilterFactory.h" />
<ClInclude Include="..\filters\ExpressionFilterFactory.h" />
<ClInclude Include="..\filters\GraphicEQFilter.h" />
<ClInclude Include="..\filters\GraphicEQFilterFactory.h" />
<ClInclude Include="..\filters\IfFilterFactory.h" />
<ClInclude Include="..\filters\IIRFilter.h" />
<ClInclude Include="..\filters\IIRFilterFactory.h" />
<ClInclude Include="..\filters\IncludeFilterFactory.h" />
<ClInclude Include="..\filters\PreampFilter.h" />
<ClInclude Include="..\filters\PreampFilterFactory.h" />
<ClInclude Include="..\filters\StageFilterFactory.h" />
<ClInclude Include="..\filters\VSTPluginFilter.h" />
<ClInclude Include="..\filters\VSTPluginFilterFactory.h" />
<ClInclude Include="..\helpers\AbstractLibrary.h" />
<ClInclude Include="..\helpers\ChannelHelper.h" />
<ClInclude Include="..\helpers\GainIterator.h" />
<ClInclude Include="..\helpers\LogHelper.h" />
<ClInclude Include="..\helpers\MemoryHelper.h" />
<ClInclude Include="..\helpers\RegistryHelper.h" />
<ClInclude Include="..\helpers\ScopeGuard.h" />
<ClInclude Include="..\helpers\StringHelper.h" />
<ClInclude Include="..\helpers\UncaughtExceptions.h" />
<ClInclude Include="..\helpers\VSTPluginInstance.h" />
<ClInclude Include="..\helpers\VSTPluginLibrary.h" />
<ClInclude Include="..\IFilter.h" />
<ClInclude Include="..\IFilterFactory.h" />
<ClInclude Include="..\libHybridConv-0.1.1\libHybridConv_eapo.h" />
<ClInclude Include="..\parser\RegexFunctions.h" />
<ClInclude Include="..\parser\RegistryFunctions.h" />
<ClInclude Include="..\parser\StringOperators.h" />
<ClInclude Include="..\stdafx.h" />
<ClInclude Include="..\VoicemeeterAPOInfo.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="VoicemeeterClient.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\AbstractAPOInfo.cpp" />
<ClCompile Include="..\FilterConfiguration.cpp" />
<ClCompile Include="..\FilterEngine.cpp" />
<ClCompile Include="..\filters\BiQuad.cpp" />
<ClCompile Include="..\filters\BiQuadFilter.cpp" />
<ClCompile Include="..\filters\BiQuadFilterFactory.cpp" />
<ClCompile Include="..\filters\ChannelFilter.cpp" />
<ClCompile Include="..\filters\ChannelFilterFactory.cpp" />
<ClCompile Include="..\filters\ConvolutionFilter.cpp" />
<ClCompile Include="..\filters\ConvolutionFilterFactory.cpp" />
<ClCompile Include="..\filters\CopyFilter.cpp" />
<ClCompile Include="..\filters\CopyFilterFactory.cpp" />
<ClCompile Include="..\filters\DelayFilter.cpp" />
<ClCompile Include="..\filters\DelayFilterFactory.cpp" />
<ClCompile Include="..\filters\DeviceFilterFactory.cpp" />
<ClCompile Include="..\filters\ExpressionFilterFactory.cpp" />
<ClCompile Include="..\filters\GraphicEQFilter.cpp" />
<ClCompile Include="..\filters\GraphicEQFilterFactory.cpp" />
<ClCompile Include="..\filters\IfFilterFactory.cpp" />
<ClCompile Include="..\filters\IIRFilter.cpp" />
<ClCompile Include="..\filters\IIRFilterFactory.cpp" />
<ClCompile Include="..\filters\IncludeFilterFactory.cpp" />
<ClCompile Include="..\filters\PreampFilter.cpp" />
<ClCompile Include="..\filters\PreampFilterFactory.cpp" />
<ClCompile Include="..\filters\StageFilterFactory.cpp" />
<ClCompile Include="..\filters\VSTPluginFilter.cpp" />
<ClCompile Include="..\filters\VSTPluginFilterFactory.cpp" />
<ClCompile Include="..\helpers\AbstractLibrary.cpp" />
<ClCompile Include="..\helpers\ChannelHelper.cpp" />
<ClCompile Include="..\helpers\GainIterator.cpp" />
<ClCompile Include="..\helpers\LogHelper.cpp" />
<ClCompile Include="..\helpers\MemoryHelper.cpp" />
<ClCompile Include="..\helpers\RegistryHelper.cpp" />
<ClCompile Include="..\helpers\StringHelper.cpp" />
<ClCompile Include="..\helpers\VSTPluginInstance.cpp" />
<ClCompile Include="..\helpers\VSTPluginLibrary.cpp" />
<ClCompile Include="..\IFilter.cpp" />
<ClCompile Include="..\libHybridConv-0.1.1\libHybridConv_eapo.cpp" />
<ClCompile Include="..\parser\RegexFunctions.cpp" />
<ClCompile Include="..\parser\RegistryFunctions.cpp" />
<ClCompile Include="..\parser\StringOperators.cpp" />
<ClCompile Include="..\stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\VoicemeeterAPOInfo.cpp" />
<ClCompile Include="VoicemeeterClient.cpp" />
</ItemGroup>
<ItemGroup>
@@ -1,267 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="helpers">
<UniqueIdentifier>{0e9ead24-f831-4803-ab47-9b5208987e65}</UniqueIdentifier>
</Filter>
<Filter Include="filters">
<UniqueIdentifier>{e112c6dd-61fc-4742-808b-298e228688ed}</UniqueIdentifier>
</Filter>
<Filter Include="parser">
<UniqueIdentifier>{171427eb-7308-4b30-88c5-27068dd8a4f2}</UniqueIdentifier>
</Filter>
<Filter Include="libHybridConv-0.1.1">
<UniqueIdentifier>{898022d7-bfa6-4240-b443-e82e638cf0f6}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\helpers\RegistryHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="VoicemeeterClient.h" />
<ClInclude Include="..\helpers\StringHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\stdafx.h" />
<ClInclude Include="..\..\..\..\..\Users\Jonas\Downloads\VoicemeeterRemoteAPI_Pack6\VoicemeeterRemote.h" />
<ClInclude Include="..\FilterConfiguration.h" />
<ClInclude Include="..\FilterEngine.h" />
<ClInclude Include="..\filters\BiQuad.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\BiQuadFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\BiQuadFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\ChannelFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\ChannelFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\ConvolutionFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\ConvolutionFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\CopyFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\CopyFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\DelayFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\DelayFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\DeviceFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\ExpressionFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\GraphicEQFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\GraphicEQFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\IfFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\IIRFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\IIRFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\IncludeFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\PreampFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\PreampFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\StageFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\parser\RegexFunctions.h">
<Filter>parser</Filter>
</ClInclude>
<ClInclude Include="..\parser\RegistryFunctions.h">
<Filter>parser</Filter>
</ClInclude>
<ClInclude Include="..\parser\StringOperators.h">
<Filter>parser</Filter>
</ClInclude>
<ClInclude Include="..\libHybridConv-0.1.1\libHybridConv_eapo.h">
<Filter>libHybridConv-0.1.1</Filter>
</ClInclude>
<ClInclude Include="..\IFilter.h" />
<ClInclude Include="..\IFilterFactory.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="..\helpers\MemoryHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\LogHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\GainIterator.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\ChannelHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="resource.h" />
<ClInclude Include="..\VoicemeeterAPOInfo.h" />
<ClInclude Include="..\AbstractAPOInfo.h" />
<ClInclude Include="..\helpers\ScopeGuard.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\UncaughtExceptions.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\AbstractLibrary.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\filters\VSTPluginFilter.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\filters\VSTPluginFilterFactory.h">
<Filter>filters</Filter>
</ClInclude>
<ClInclude Include="..\helpers\VSTPluginLibrary.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="..\helpers\VSTPluginInstance.h">
<Filter>helpers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\helpers\RegistryHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="VoicemeeterClient.cpp" />
<ClCompile Include="..\helpers\StringHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\stdafx.cpp" />
<ClCompile Include="..\FilterConfiguration.cpp" />
<ClCompile Include="..\FilterEngine.cpp" />
<ClCompile Include="..\filters\BiQuad.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\BiQuadFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\BiQuadFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\ChannelFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\ChannelFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\ConvolutionFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\ConvolutionFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\CopyFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\CopyFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\DelayFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\DelayFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\DeviceFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\ExpressionFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\GraphicEQFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\GraphicEQFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\IfFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\IIRFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\IIRFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\IncludeFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\PreampFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\PreampFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\StageFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\parser\RegexFunctions.cpp">
<Filter>parser</Filter>
</ClCompile>
<ClCompile Include="..\parser\RegistryFunctions.cpp">
<Filter>parser</Filter>
</ClCompile>
<ClCompile Include="..\parser\StringOperators.cpp">
<Filter>parser</Filter>
</ClCompile>
<ClCompile Include="..\libHybridConv-0.1.1\libHybridConv_eapo.cpp">
<Filter>libHybridConv-0.1.1</Filter>
</ClCompile>
<ClCompile Include="..\IFilter.cpp" />
<ClCompile Include="..\helpers\MemoryHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\helpers\LogHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\helpers\GainIterator.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\helpers\ChannelHelper.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\VoicemeeterAPOInfo.cpp" />
<ClCompile Include="..\AbstractAPOInfo.cpp" />
<ClCompile Include="..\helpers\AbstractLibrary.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\filters\VSTPluginFilter.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\filters\VSTPluginFilterFactory.cpp">
<Filter>filters</Filter>
</ClCompile>
<ClCompile Include="..\helpers\VSTPluginLibrary.cpp">
<Filter>helpers</Filter>
</ClCompile>
<ClCompile Include="..\helpers\VSTPluginInstance.cpp">
<Filter>helpers</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="VoicemeeterClient.rc" />
@@ -269,4 +22,9 @@
<ItemGroup>
<None Include="..\EqualizerAPO.licenseheader" />
</ItemGroup>
<ItemGroup>
<Filter Include="helpers">
<UniqueIdentifier>{eb32c27d-e4c2-4cad-a72d-b798d4514714}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>
+1
View File
@@ -18,6 +18,7 @@
*/
#include "stdafx.h"
#include <mpParser.h>
#include "helpers/LogHelper.h"
#include "helpers/StringHelper.h"
#ifndef NO_FILTERENGINE
+1
View File
@@ -18,6 +18,7 @@
*/
#include "stdafx.h"
#include <mpParser.h>
#include "helpers/LogHelper.h"
#include "helpers/StringHelper.h"
#include "FilterEngine.h"
+1
View File
@@ -20,6 +20,7 @@
#pragma once
#include <string>
#include <stack>
#include "IFilterFactory.h"
#include "IFilter.h"