From 29cce986396152d338d5492110b0a4e42dc72298 Mon Sep 17 00:00:00 2001 From: Tatsuya Shiozawa Date: Wed, 22 Feb 2017 01:51:16 +0900 Subject: [PATCH] =?UTF-8?q?midiCC=E3=81=AE=E3=83=AD=E3=82=B0=E5=87=BA?= =?UTF-8?q?=E5=8A=9B=E3=82=92=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=B9=E3=81=A7?= =?UTF-8?q?=E7=84=A1=E5=8A=B9=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Builds/VisualStudio2015/GLSLPlugIn.sln | 20 +- .../VisualStudio2015/GLSLPlugIn.vcxproj | 1509 +++++++++-------- .../GLSLPlugIn.vcxproj.filters | 157 +- GLSLPlugIn/Source/GLSLComponent.cpp | 6 +- 4 files changed, 846 insertions(+), 846 deletions(-) diff --git a/GLSLPlugIn/Builds/VisualStudio2015/GLSLPlugIn.sln b/GLSLPlugIn/Builds/VisualStudio2015/GLSLPlugIn.sln index 1740898..e515844 100644 --- a/GLSLPlugIn/Builds/VisualStudio2015/GLSLPlugIn.sln +++ b/GLSLPlugIn/Builds/VisualStudio2015/GLSLPlugIn.sln @@ -1,17 +1,31 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2015 -Project("{DFB64533-3F0B-3F28-CF3E-4C78A0794AD3}") = "GLSLPlugIn", "GLSLPlugIn.vcxproj", "{A56B9DB1-0BA3-1C7E-115D-61766DB4394A}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLSLPlugIn", "GLSLPlugIn.vcxproj", "{A56B9DB1-0BA3-1C7E-115D-61766DB4394A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Win32 = Release|Win32 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Debug|Win32.ActiveCfg = Debug|Win32 + {A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Debug|Win32.Build.0 = Debug|Win32 {A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Debug|x64.ActiveCfg = Debug|x64 {A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Debug|x64.Build.0 = Debug|x64 + {A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Debug|x86.ActiveCfg = Debug|Win32 + {A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Debug|x86.Build.0 = Debug|Win32 + {A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Release|Win32.ActiveCfg = Release|Win32 + {A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Release|Win32.Build.0 = Release|Win32 {A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Release|x64.ActiveCfg = Release|x64 {A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Release|x64.Build.0 = Release|x64 + {A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Release|x86.ActiveCfg = Release|Win32 + {A56B9DB1-0BA3-1C7E-115D-61766DB4394A}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/GLSLPlugIn/Builds/VisualStudio2015/GLSLPlugIn.vcxproj b/GLSLPlugIn/Builds/VisualStudio2015/GLSLPlugIn.vcxproj index c65bcc9..428bcb0 100644 --- a/GLSLPlugIn/Builds/VisualStudio2015/GLSLPlugIn.vcxproj +++ b/GLSLPlugIn/Builds/VisualStudio2015/GLSLPlugIn.vcxproj @@ -1,11 +1,18 @@ - - + + + Debug + Win32 + Debug x64 + + Release + Win32 + Release x64 @@ -15,13 +22,19 @@ {A56B9DB1-0BA3-1C7E-115D-61766DB4394A} v140 - + DynamicLibrary false v140 v140 + + DynamicLibrary + false + v140 + v140 + DynamicLibrary false @@ -29,11 +42,17 @@ v140 v140 - - + + DynamicLibrary + false + true + v140 + v140 + + + - + v140 @@ -41,11 +60,17 @@ <_ProjectFileVersion>10.0.30319.1 GLSLPlugIn + GLSLPlugIn .dll + .dll true + true GLSLPlugIn + GLSLPlugIn .dll + .dll true + true v140 @@ -54,7 +79,47 @@ true true Win32 - + + + + Disabled + ProgramDatabase + ..\..\JuceLibraryCode;..\..\..\JUCE\modules;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + + $(IntDir)\ + $(IntDir)\ + $(IntDir)\ + Level4 + true + true + + + _DEBUG;%(PreprocessorDefinitions) + + + $(OutDir)\GLSLPlugIn.dll + true + libcmt.lib; msvcrt.lib;;%(IgnoreSpecificDefaultLibraries) + true + $(IntDir)\GLSLPlugIn.pdb + Windows + true + + + true + $(IntDir)\GLSLPlugIn.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + + Disabled @@ -63,7 +128,8 @@ _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;%(PreprocessorDefinitions) MultiThreadedDebugDLL true - + + $(IntDir)\ $(IntDir)\ $(IntDir)\ @@ -94,7 +160,51 @@ true true Win32 - + + + + Full + ..\..\JuceLibraryCode;..\..\..\JUCE\modules;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + $(IntDir)\ + $(IntDir)\ + $(IntDir)\ + Level4 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + + + $(OutDir)\GLSLPlugIn.dll + true + %(IgnoreSpecificDefaultLibraries) + false + $(IntDir)\GLSLPlugIn.pdb + Windows + true + true + true + + + true + $(IntDir)\GLSLPlugIn.bsc + + + copy "$(TargetPath)" "C:\Program Files\VSTplugins x64\My Build VST\" + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + + Full @@ -102,7 +212,8 @@ _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;%(PreprocessorDefinitions) MultiThreadedDLL true - + + $(IntDir)\ $(IntDir)\ $(IntDir)\ @@ -129,15 +240,15 @@ $(IntDir)\GLSLPlugIn.bsc - copy "$(TargetPath)" "C:\Program Files\VSTplugins x64\My Build VST\" + copy "$(TargetPath)" "C:\Program Files\VSTplugins x64\My Build VST\" - - - - - + + + + + true @@ -1781,692 +1892,692 @@ true - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - - + + + \ No newline at end of file diff --git a/GLSLPlugIn/Builds/VisualStudio2015/GLSLPlugIn.vcxproj.filters b/GLSLPlugIn/Builds/VisualStudio2015/GLSLPlugIn.vcxproj.filters index 5f37f73..24e438c 100644 --- a/GLSLPlugIn/Builds/VisualStudio2015/GLSLPlugIn.vcxproj.filters +++ b/GLSLPlugIn/Builds/VisualStudio2015/GLSLPlugIn.vcxproj.filters @@ -1,5 +1,4 @@ - - + @@ -490,9 +489,6 @@ Juce Modules\juce_audio_basics - - Juce Modules\juce_audio_basics - Juce Modules\juce_audio_devices\audio_io @@ -556,9 +552,6 @@ Juce Modules\juce_audio_devices - - Juce Modules\juce_audio_devices - Juce Modules\juce_audio_formats\codecs\flac\libFLAC @@ -730,9 +723,6 @@ Juce Modules\juce_audio_formats - - Juce Modules\juce_audio_formats - Juce Modules\juce_audio_plugin_client\AAX @@ -796,12 +786,6 @@ Juce Modules\juce_audio_plugin_client\AU\CoreAudioUtilityClasses - - Juce Modules\juce_audio_plugin_client\AU - - - Juce Modules\juce_audio_plugin_client\AU - Juce Modules\juce_audio_plugin_client\RTAS @@ -811,9 +795,6 @@ Juce Modules\juce_audio_plugin_client\RTAS - - Juce Modules\juce_audio_plugin_client\RTAS - Juce Modules\juce_audio_plugin_client\RTAS @@ -829,27 +810,12 @@ Juce Modules\juce_audio_plugin_client\VST - - Juce Modules\juce_audio_plugin_client\VST - Juce Modules\juce_audio_plugin_client\VST3 Juce Modules\juce_audio_plugin_client - - Juce Modules\juce_audio_plugin_client - - - Juce Modules\juce_audio_plugin_client - - - Juce Modules\juce_audio_plugin_client - - - Juce Modules\juce_audio_plugin_client - Juce Modules\juce_audio_plugin_client @@ -865,18 +831,12 @@ Juce Modules\juce_audio_plugin_client - - Juce Modules\juce_audio_plugin_client - Juce Modules\juce_audio_plugin_client Juce Modules\juce_audio_plugin_client - - Juce Modules\juce_audio_plugin_client - Juce Modules\juce_audio_plugin_client @@ -889,9 +849,6 @@ Juce Modules\juce_audio_processors\format - - Juce Modules\juce_audio_processors\format_types - Juce Modules\juce_audio_processors\format_types @@ -934,9 +891,6 @@ Juce Modules\juce_audio_processors - - Juce Modules\juce_audio_processors - Juce Modules\juce_core\containers @@ -1048,21 +1002,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 @@ -1231,9 +1170,6 @@ Juce Modules\juce_core - - Juce Modules\juce_core - Juce Modules\juce_cryptography\encryption @@ -1255,9 +1191,6 @@ Juce Modules\juce_cryptography - - Juce Modules\juce_cryptography - Juce Modules\juce_data_structures\app_properties @@ -1282,9 +1215,6 @@ Juce Modules\juce_data_structures - - Juce Modules\juce_data_structures - Juce Modules\juce_events\broadcasters @@ -1318,15 +1248,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 @@ -1339,9 +1263,6 @@ Juce Modules\juce_events - - Juce Modules\juce_events - Juce Modules\juce_graphics\colour @@ -1618,12 +1539,6 @@ Juce Modules\juce_graphics\native - - Juce Modules\juce_graphics\native - - - Juce Modules\juce_graphics\native - Juce Modules\juce_graphics\native @@ -1642,9 +1557,6 @@ Juce Modules\juce_graphics - - Juce Modules\juce_graphics - Juce Modules\juce_gui_basics\application @@ -1876,12 +1788,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 @@ -1891,21 +1797,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 @@ -2026,9 +1917,6 @@ Juce Modules\juce_gui_basics - - Juce Modules\juce_gui_basics - Juce Modules\juce_gui_extra\code_editor @@ -2077,27 +1965,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 @@ -2110,9 +1986,6 @@ Juce Modules\juce_gui_extra - - Juce Modules\juce_gui_extra - Juce Modules\juce_opengl\opengl @@ -2143,21 +2016,12 @@ Juce Modules\juce_opengl - - Juce Modules\juce_opengl - Juce Modules\juce_video\capture Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native @@ -2170,9 +2034,6 @@ Juce Modules\juce_video - - Juce Modules\juce_video - Juce Library Code @@ -4182,6 +4043,20 @@ Juce Library Code + + + + + + + + + + + + + + @@ -4217,4 +4092,4 @@ Juce Library Code - + \ No newline at end of file diff --git a/GLSLPlugIn/Source/GLSLComponent.cpp b/GLSLPlugIn/Source/GLSLComponent.cpp index 2ef48f5..df2fcdc 100644 --- a/GLSLPlugIn/Source/GLSLComponent.cpp +++ b/GLSLPlugIn/Source/GLSLComponent.cpp @@ -228,14 +228,14 @@ void GLSLComponent::setMidiCCValue(int ccNumber, float value) { if (ccNumber < 128) { m_midiCC[ccNumber] = value; - - if (statusLabel != nullptr) +#ifdef DEBUG + if (statusLabel != nullptr) { auto cText = statusLabel->getText(); cText += " /" + String(ccNumber) + "-" + String(value, 1); statusLabel->setText(cText, dontSendNotification); } - +#endif // DEBUG } }