diff --git a/Builds/VisualStudio2012/Dexed.sln b/Builds/VisualStudio2012/Dexed.sln index 6b5dd1b..5795149 100644 --- a/Builds/VisualStudio2012/Dexed.sln +++ b/Builds/VisualStudio2012/Dexed.sln @@ -1,17 +1,23 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2012 -Project("{BD26B4C3-163D-4785-A63F-D3E66858BFF3}") = "Dexed", "Dexed.vcxproj", "{1A9EF105-5BF5-9FB6-9634-A91A6D840866}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 2012 for Windows Desktop +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dexed", "Dexed.vcxproj", "{1A9EF105-5BF5-9FB6-9634-A91A6D840866}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Debug|Win32.ActiveCfg = Debug|Win32 {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Debug|Win32.Build.0 = Debug|Win32 + {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Debug|x64.ActiveCfg = Debug|x64 + {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Debug|x64.Build.0 = Debug|x64 {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Release|Win32.ActiveCfg = Release|Win32 {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Release|Win32.Build.0 = Release|Win32 + {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Release|x64.ActiveCfg = Release|x64 + {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Builds/VisualStudio2012/Dexed.v11.suo b/Builds/VisualStudio2012/Dexed.v11.suo index 6c8e5c3..247bdaf 100644 Binary files a/Builds/VisualStudio2012/Dexed.v11.suo and b/Builds/VisualStudio2012/Dexed.v11.suo differ diff --git a/Builds/VisualStudio2012/Dexed.vcxproj b/Builds/VisualStudio2012/Dexed.vcxproj index 9ccec7a..525b8e9 100644 --- a/Builds/VisualStudio2012/Dexed.vcxproj +++ b/Builds/VisualStudio2012/Dexed.vcxproj @@ -1,27 +1,40 @@ - - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {1A9EF105-5BF5-9FB6-9634-A91A6D840866} v110 - + DynamicLibrary false MultiByte v110 + + DynamicLibrary + false + MultiByte + v110 + DynamicLibrary false @@ -29,11 +42,17 @@ true v110 - - + + DynamicLibrary + false + MultiByte + true + v110 + + + - + v110 @@ -42,10 +61,14 @@ <_ProjectFileVersion>10.0.30319.1 .\Debug\ Dexed + Dexed true + true .\Release\ Dexed + Dexed true + true v110 @@ -54,7 +77,7 @@ true true Win32 - + Disabled @@ -63,7 +86,7 @@ WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions) MultiThreadedDebug true - + $(IntDir)\ $(IntDir)\ $(IntDir)\ @@ -90,13 +113,55 @@ $(IntDir)\Dexed.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + + + + + Disabled + ProgramDatabase + ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;C:\work\vstsdk2.4;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions) + MultiThreadedDebug + true + + + $(IntDir)\ + $(IntDir)\ + $(IntDir)\ + Level4 + true + true + + + _DEBUG;%(PreprocessorDefinitions) + + + $(OutDir)\Dexed.dll + true + libcmt.lib; msvcrt.lib;;%(IgnoreSpecificDefaultLibraries) + true + $(IntDir)\Dexed.pdb + Windows + false + true + + + true + $(IntDir)\Dexed.bsc + + NDEBUG;%(PreprocessorDefinitions) true true Win32 - + MinSpace @@ -104,7 +169,7 @@ WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions) MultiThreaded true - + $(IntDir)\ $(IntDir)\ $(IntDir)\ @@ -132,25 +197,67 @@ $(IntDir)\Dexed.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + + + + + MinSpace + ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;C:\work\vstsdk2.4;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions) + MultiThreaded + true + + + $(IntDir)\ + $(IntDir)\ + $(IntDir)\ + Level4 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + + + $(OutDir)\Dexed.dll + true + %(IgnoreSpecificDefaultLibraries) + false + $(IntDir)\Dexed.pdb + Windows + true + true + true + + + true + $(IntDir)\Dexed.bsc + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + true @@ -1081,20 +1188,20 @@ true - - - - - - - - - - - - - - + + + + + + + + + + + + + + StdCall @@ -1110,434 +1217,434 @@ StdCall - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - + + + \ No newline at end of file diff --git a/Builds/VisualStudio2012/Dexed.vcxproj.filters b/Builds/VisualStudio2012/Dexed.vcxproj.filters index 3569e1b..2ad191a 100644 --- a/Builds/VisualStudio2012/Dexed.vcxproj.filters +++ b/Builds/VisualStudio2012/Dexed.vcxproj.filters @@ -1,5 +1,4 @@ - - + @@ -376,9 +375,6 @@ Juce Modules\juce_audio_basics\synthesisers - - Juce Modules\juce_audio_plugin_client\AU - Juce Modules\juce_audio_plugin_client\RTAS @@ -394,21 +390,12 @@ Juce Modules\juce_audio_plugin_client\RTAS - - Juce Modules\juce_audio_plugin_client\RTAS - Juce Modules\juce_audio_plugin_client\VST - - Juce Modules\juce_audio_plugin_client\VST - Juce Modules\juce_audio_plugin_client\AAX - - Juce Modules\juce_audio_plugin_client\AAX - Juce Modules\juce_audio_plugin_client\utility @@ -433,9 +420,6 @@ Juce Modules\juce_audio_processors\format - - Juce Modules\juce_audio_processors\format_types - Juce Modules\juce_audio_processors\format_types @@ -670,21 +654,6 @@ Juce Modules\juce_core\native - - Juce Modules\juce_core\native - - - Juce Modules\juce_core\native - - - Juce Modules\juce_core\native - - - Juce Modules\juce_core\native - - - Juce Modules\juce_core\native - Juce Modules\juce_core\native @@ -754,15 +723,9 @@ Juce Modules\juce_events\native - - Juce Modules\juce_events\native - Juce Modules\juce_events\native - - Juce Modules\juce_events\native - Juce Modules\juce_events\native @@ -862,12 +825,6 @@ Juce Modules\juce_graphics\native - - Juce Modules\juce_graphics\native - - - Juce Modules\juce_graphics\native - Juce Modules\juce_graphics\native @@ -1222,12 +1179,6 @@ Juce Modules\juce_gui_basics\native - - Juce Modules\juce_gui_basics\native - - - Juce Modules\juce_gui_basics\native - Juce Modules\juce_gui_basics\native @@ -1237,21 +1188,6 @@ Juce Modules\juce_gui_basics\native - - Juce Modules\juce_gui_basics\native - - - Juce Modules\juce_gui_basics\native - - - Juce Modules\juce_gui_basics\native - - - Juce Modules\juce_gui_basics\native - - - Juce Modules\juce_gui_basics\native - Juce Modules\juce_gui_basics\native @@ -1297,27 +1233,15 @@ Juce Modules\juce_gui_extra\native - - Juce Modules\juce_gui_extra\native - Juce Modules\juce_gui_extra\native Juce Modules\juce_gui_extra\native - - Juce Modules\juce_gui_extra\native - - - Juce Modules\juce_gui_extra\native - Juce Modules\juce_gui_extra\native - - Juce Modules\juce_gui_extra\native - Juce Modules\juce_gui_extra\native @@ -1387,6 +1311,14 @@ Juce Library Code + + + + + + + + @@ -2654,4 +2586,4 @@ Juce Library Code - + \ No newline at end of file diff --git a/Source/DXComponents.cpp b/Source/DXComponents.cpp index 74d2824..8b3c59f 100644 --- a/Source/DXComponents.cpp +++ b/Source/DXComponents.cpp @@ -195,11 +195,7 @@ void PitchEnvDisplay::paint(Graphics &g) { dist[0] = dist[1] = dist[2] = dist[3] = 1; total = 4; } - - TRACE("total %f", total); - TRACE("level %d %d %d %d", levels[0], levels[1], levels[2], levels[3]); - TRACE("dist %f %f %f %f", dist[0], dist[1], dist[2], dist[3]); - + // TODO : this is WIP float ratio = 96 / total; diff --git a/Source/PluginParam.cpp b/Source/PluginParam.cpp index 01fe8af..243b247 100755 --- a/Source/PluginParam.cpp +++ b/Source/PluginParam.cpp @@ -18,12 +18,12 @@ * Boston, MA 02110-1301 USA. */ +#include + #include "PluginParam.h" #include "PluginProcessor.h" #include "PluginEditor.h" - - // ************************************************************************ // Ctrl::Ctrl(String name) {