From 00840fe549f867eb8e4ab0f94ec3b11dd1b38272 Mon Sep 17 00:00:00 2001 From: micknoise Date: Sat, 8 Aug 2015 21:37:11 +0100 Subject: Tested and Working in Visual Studio 2015. Commit! --- main.cpp | 34 +--- maximilian.cpp | 2 +- maximilian.h | 4 + .../maximilianTestWindowsVS2010.sln | 20 --- .../maximilianTestWindowsVS2010.vcxproj | 196 +++++++++++---------- .../maximilianTestWindowsVS2010.vcxproj.filters | 118 +++++++------ .../maximilianTestWindowsVS2015.sln | 20 +++ 7 files changed, 189 insertions(+), 205 deletions(-) delete mode 100644 maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.sln create mode 100644 maximilianTestWindowsVS2010/maximilianTestWindowsVS2015.sln diff --git a/main.cpp b/main.cpp index 07795df..e3e50cb 100755 --- a/main.cpp +++ b/main.cpp @@ -1,5 +1,4 @@ #include "maximilian.h" -#include "libs/maxim.h" //This shows how to use maximilian to build a polyphonic synth. @@ -17,27 +16,9 @@ int currentCount,lastCount,voice=0;//these values are used to check if we have a double VCO1out[6],VCO2out[6],LFO1out[6],LFO2out[6],VCFout[6],ADSRout[6],mix,pitch[6]; -maxiFFTOctaveAnalyzer octo; -int nAverages; -float *ifftOutput; -int ifftSize; - -maxiIFFT ifft; -maxiFFT mfft; -int fftSize; -int bins, dataSize; - void setup() {//some inits - fftSize = 1024; - mfft.setup(fftSize, 1024, 256); - ifft.setup(fftSize, 1024, 256); - - - nAverages = 12; - octo.setup(44100, fftSize/2, nAverages); - for (int i=0;i<6;i++) { ADSR[i].setAttack(0); @@ -66,13 +47,6 @@ void play(double *output) { pitch[voice]=voice+1; voice++; - lastCount=0; - cout << mfft.spectralFlatness() << ", " << mfft.spectralCentroid() << endl; - - for (int i=0; i #include "math.h" +#ifdef _WIN32 || _WIN64 +#include +#endif + using namespace std; #ifndef PI #define PI 3.1415926535897932384626433832795 diff --git a/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.sln b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.sln deleted file mode 100644 index 9a258d6..0000000 --- a/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "maximilianTestWindowsVS2010", "maximilianTestWindowsVS2010\maximilianTestWindowsVS2010.vcxproj", "{599B9B87-ABE8-4096-A0E7-A68775D8A284}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {599B9B87-ABE8-4096-A0E7-A68775D8A284}.Debug|Win32.ActiveCfg = Debug|Win32 - {599B9B87-ABE8-4096-A0E7-A68775D8A284}.Debug|Win32.Build.0 = Debug|Win32 - {599B9B87-ABE8-4096-A0E7-A68775D8A284}.Release|Win32.ActiveCfg = Release|Win32 - {599B9B87-ABE8-4096-A0E7-A68775D8A284}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj index 54a6575..896dfc4 100644 --- a/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj +++ b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj @@ -1,96 +1,102 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {599B9B87-ABE8-4096-A0E7-A68775D8A284} - Win32Proj - maximilianTestWindowsVS2010 - - - - Application - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - true - - - false - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;__WINDOWS_DS__;%(PreprocessorDefinitions) - - - Console - true - DSound.lib;%(AdditionalDependencies) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {599B9B87-ABE8-4096-A0E7-A68775D8A284} + Win32Proj + maximilianTestWindowsVS2010 + 8.1 + maximilianTestWindowsVS2015 + + + + Application + true + Unicode + v140 + + + Application + false + true + Unicode + + + + + + + + + + + + + true + + + false + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;__WINDOWS_DS__;%(PreprocessorDefinitions) + C:\Users\dev\Documents\GitHubVisualStudio\Maximilian\libs;%(AdditionalIncludeDirectories) + + + Console + true + DSound.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj.filters b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj.filters index 6f24e7e..c88fc8b 100644 --- a/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj.filters +++ b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj.filters @@ -1,57 +1,63 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - - - - Header Files - - - Header Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + + + + Header Files + + + Header Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files + + + Source Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/maximilianTestWindowsVS2010/maximilianTestWindowsVS2015.sln b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2015.sln new file mode 100644 index 0000000..9a258d6 --- /dev/null +++ b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2015.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "maximilianTestWindowsVS2010", "maximilianTestWindowsVS2010\maximilianTestWindowsVS2010.vcxproj", "{599B9B87-ABE8-4096-A0E7-A68775D8A284}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {599B9B87-ABE8-4096-A0E7-A68775D8A284}.Debug|Win32.ActiveCfg = Debug|Win32 + {599B9B87-ABE8-4096-A0E7-A68775D8A284}.Debug|Win32.Build.0 = Debug|Win32 + {599B9B87-ABE8-4096-A0E7-A68775D8A284}.Release|Win32.ActiveCfg = Release|Win32 + {599B9B87-ABE8-4096-A0E7-A68775D8A284}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal -- cgit v1.3