Merge branch 'develop'

rsjaffe · Jul 24, 2020 · b7961be · b7961be
2 parents 226ee20 + 30b6fe1
commit b7961be
Show file tree

Hide file tree

Showing 27 changed files with 124 additions and 76 deletions.
diff --git a/MIDI2LR.jucer b/MIDI2LR.jucer
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="3.5.0.2"
+<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="3.5.0.3"
               bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
               companyWebsite="http://rsjaffe.github.io/MIDI2LR/" companyEmail="rsjaffe@gmail.com"
               displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"

diff --git a/build/MacOS/Info-App.plist b/build/MacOS/Info-App.plist
@@ -20,9 +20,9 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleShortVersionString</key>
-    <string>3.5.0.2</string>
+    <string>3.5.0.3</string>
     <key>CFBundleVersion</key>
-    <string>3.5.0.2</string>
+    <string>3.5.0.3</string>
     <key>NSHumanReadableCopyright</key>
     <string></string>
     <key>NSHighResolutionCapable</key>

diff --git a/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj b/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj
@@ -1020,8 +1020,8 @@
 					"DEBUG=1",
 					"GSL_THROW_ON_CONTRACT_VIOLATION=1",
 					"JUCER_XCODE_MAC_46BB2872=1",
-					"JUCE_APP_VERSION=3.5.0.2",
-					"JUCE_APP_VERSION_HEX=0x3050002",
+					"JUCE_APP_VERSION=3.5.0.3",
+					"JUCE_APP_VERSION_HEX=0x3050003",
 					"JucePlugin_Build_VST=0",
 					"JucePlugin_Build_VST3=0",
 					"JucePlugin_Build_AU=0",
@@ -1100,8 +1100,8 @@
 					"NDEBUG=1",
 					"GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1",
 					"JUCER_XCODE_MAC_46BB2872=1",
-					"JUCE_APP_VERSION=3.5.0.2",
-					"JUCE_APP_VERSION_HEX=0x3050002",
+					"JUCE_APP_VERSION=3.5.0.3",
+					"JUCE_APP_VERSION_HEX=0x3050003",
 					"JucePlugin_Build_VST=0",
 					"JucePlugin_Build_VST3=0",
 					"JucePlugin_Build_AU=0",

diff --git a/build/Windows/MIDI2LR_App.vcxproj b/build/Windows/MIDI2LR_App.vcxproj
@@ -64,7 +64,7 @@
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;../../external/asio/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;GSL_THROW_ON_CONTRACT_VIOLATION=1;_WIN32_WINNT=0x0601;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=3.5.0.2;JUCE_APP_VERSION_HEX=0x3050002;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60001;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_WASAPI_EXCLUSIVE=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;GSL_THROW_ON_CONTRACT_VIOLATION=1;_WIN32_WINNT=0x0601;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=3.5.0.3;JUCE_APP_VERSION_HEX=0x3050003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60001;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_WASAPI_EXCLUSIVE=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
@@ -105,7 +105,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;../../external/asio/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;_WIN32_WINNT=0x0601;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=3.5.0.2;JUCE_APP_VERSION_HEX=0x3050002;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60001;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_WASAPI_EXCLUSIVE=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;_WIN32_WINNT=0x0601;JUCER_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=3.5.0.3;JUCE_APP_VERSION_HEX=0x3050003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60001;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_WINRT_MIDI=0;JUCE_ASIO=0;JUCE_WASAPI=0;JUCE_WASAPI_EXCLUSIVE=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_JACK=0;JUCE_BELA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_USE_ANDROID_OPENSLES=0;JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS=0;JUCE_FORCE_DEBUG=0;JUCE_LOG_ASSERTIONS=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>

diff --git a/build/Windows/resources.rc b/build/Windows/resources.rc
@@ -9,16 +9,16 @@
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION  3,5,0,2
+FILEVERSION  3,5,0,3
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
     BLOCK "040904E4"
     BEGIN
       VALUE "FileDescription",  "MIDI2LR\0"
-      VALUE "FileVersion",  "3.5.0.2\0"
+      VALUE "FileVersion",  "3.5.0.3\0"
       VALUE "ProductName",  "MIDI2LR\0"
-      VALUE "ProductVersion",  "3.5.0.2\0"
+      VALUE "ProductVersion",  "3.5.0.3\0"
     END
   END