diff --git a/musikcube.sln b/musikcube.sln index 7736c9c9a..cdf4c103d 100644 --- a/musikcube.sln +++ b/musikcube.sln @@ -57,6 +57,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{CE0E EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stockencoders", "src\plugins\stockencoders\stockencoders.vcxproj", "{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "supereqdsp", "src\plugins\supereqdsp\supereqdsp.vcxproj", "{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -177,6 +179,12 @@ Global {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release|Win32.Build.0 = Release|Win32 {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release|x64.ActiveCfg = Release|x64 {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release|x64.Build.0 = Release|x64 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug|Win32.ActiveCfg = Debug|Win32 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug|Win32.Build.0 = Debug|Win32 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug|x64.ActiveCfg = Debug|Win32 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release|Win32.ActiveCfg = Release|Win32 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release|Win32.Build.0 = Release|Win32 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -196,6 +204,7 @@ Global {BA3902E0-8915-4E59-AD3B-F9960507F234} = {CE0E0AF3-A106-4992-BEBD-B842B983D0FE} {FA74D37C-8184-4596-BFE9-766C159045E1} = {CE0E0AF3-A106-4992-BEBD-B842B983D0FE} {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA} = {CE0E0AF3-A106-4992-BEBD-B842B983D0FE} + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730} = {CE0E0AF3-A106-4992-BEBD-B842B983D0FE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9B481265-6DD9-4083-8D4A-247B6A58644F} diff --git a/src/musikcube/app/overlay/EqualizerOverlay.cpp b/src/musikcube/app/overlay/EqualizerOverlay.cpp index b401db9d0..425d70e8c 100644 --- a/src/musikcube/app/overlay/EqualizerOverlay.cpp +++ b/src/musikcube/app/overlay/EqualizerOverlay.cpp @@ -32,6 +32,8 @@ // ////////////////////////////////////////////////////////////////////////////// +#include "stdafx.h" + #include "EqualizerOverlay.h" #include diff --git a/src/musikcube/musikcube.vcxproj b/src/musikcube/musikcube.vcxproj index 59537683e..87fedf979 100755 --- a/src/musikcube/musikcube.vcxproj +++ b/src/musikcube/musikcube.vcxproj @@ -158,6 +158,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win32\font\*.ttf" "$(TargetDir)fonts\" /Y + @@ -222,6 +223,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win32\font\*.ttf" "$(TargetDir)fonts\" /Y + diff --git a/src/musikcube/musikcube.vcxproj.filters b/src/musikcube/musikcube.vcxproj.filters index 588407a64..d6366220d 100755 --- a/src/musikcube/musikcube.vcxproj.filters +++ b/src/musikcube/musikcube.vcxproj.filters @@ -171,6 +171,9 @@ app\overlay + + app\overlay + @@ -394,6 +397,9 @@ app + + app\overlay + diff --git a/src/plugins/supereqdsp/SuperEqDsp.cpp b/src/plugins/supereqdsp/SuperEqDsp.cpp index bacb26b44..fbf9dfa99 100644 --- a/src/plugins/supereqdsp/SuperEqDsp.cpp +++ b/src/plugins/supereqdsp/SuperEqDsp.cpp @@ -88,15 +88,15 @@ bool SuperEqDsp::Process(IBuffer* buffer) { void *params = paramlist_alloc(); float bands[17]; - for (int i = 0; i < BANDS.size(); i++) { - bands[i] = prefs->GetDouble(BANDS[i].c_str(), 1.0); + for (size_t i = 0; i < BANDS.size(); i++) { + bands[i] = (float) prefs->GetDouble(BANDS[i].c_str(), 1.0); } equ_makeTable( this->supereq, bands, params, - buffer->SampleRate()); + (float) buffer->SampleRate()); paramlist_free(params); } diff --git a/src/plugins/supereqdsp/constants.h b/src/plugins/supereqdsp/constants.h index 31904b558..08856bd5a 100644 --- a/src/plugins/supereqdsp/constants.h +++ b/src/plugins/supereqdsp/constants.h @@ -36,6 +36,14 @@ #include +#ifdef WIN32 +#define WIN32_LEAN_AND_MEAN +#define WINVER 0x0502 +#define _WIN32_WINNT 0x0502 +#define NOMINMAX +#include +#endif + #ifdef WIN32 #define DLLEXPORT __declspec(dllexport) #else diff --git a/src/plugins/supereqdsp/supereqdsp.filters b/src/plugins/supereqdsp/supereqdsp.filters new file mode 100644 index 000000000..ba0e640ef --- /dev/null +++ b/src/plugins/supereqdsp/supereqdsp.filters @@ -0,0 +1,32 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd;cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + plugin + + + plugin + + + plugin + + + + + plugin + + + plugin + + + \ No newline at end of file diff --git a/src/plugins/supereqdsp/supereqdsp.vcxproj b/src/plugins/supereqdsp/supereqdsp.vcxproj new file mode 100644 index 000000000..7c93f64b0 --- /dev/null +++ b/src/plugins/supereqdsp/supereqdsp.vcxproj @@ -0,0 +1,126 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + {ed0f666a-c9e4-4b6c-af89-bafbb47c3730} + supereqdsp + 10.0.16299.0 + + + + DynamicLibrary + v141 + Unicode + true + + + DynamicLibrary + v141 + Unicode + false + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25123.0 + + + $(SolutionDir)/bin/$(Configuration)/plugins\ + ./obj/$(Configuration)\ + true + MinimumRecommendedRules.ruleset + + + + + $(SolutionDir)/bin/$(Configuration)/plugins\ + ./obj/$(Configuration)\ + MinimumRecommendedRules.ruleset + + + + + + Disabled + ../..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level3 + EditAndContinue + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + MachineX86 + false + + + + + Default + true + ../..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + true + MultiThreaded + Full + Sync + + + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + Windows + true + true + MachineX86 + false + false + + + + + + \ No newline at end of file diff --git a/src/plugins/supereqdsp/supereqdsp.vcxproj.filters b/src/plugins/supereqdsp/supereqdsp.vcxproj.filters new file mode 100644 index 000000000..9cb404a9c --- /dev/null +++ b/src/plugins/supereqdsp/supereqdsp.vcxproj.filters @@ -0,0 +1,39 @@ + + + + + {8a763391-5af9-4f77-a19e-c7c432539c50} + + + {ecc766df-beda-4169-af03-e4cb58ee1335} + + + + + plugin\supereq + + + plugin\supereq + + + plugin + + + plugin + + + + + plugin\supereq + + + plugin\supereq + + + plugin + + + plugin + + + \ No newline at end of file