From 355487c0f8b65a6802899b6f141ec48dc639301b Mon Sep 17 00:00:00 2001 From: Rory Jaffe Date: Tue, 1 Feb 2022 13:06:33 -0800 Subject: [PATCH 1/3] 5.3.0.2 --- MIDI2LR.jucer | 2 +- build/MacOS/Info-App.plist | 4 ++-- build/MacOS/MIDI2LR.xcodeproj/project.pbxproj | 8 ++++---- build/Windows/MIDI2LR_App.vcxproj | 4 ++-- build/Windows/resources.rc | 6 +++--- external/JuceLibraryCode/JuceHeader.h | 4 ++-- src/plugin/Info.lua | 2 +- tools/doxygen/Midi2lr.Doxyfile | 2 +- tools/installer/MIDI2LR.xml | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/MIDI2LR.jucer b/MIDI2LR.jucer index b2ba8651c..578a49e56 100644 --- a/MIDI2LR.jucer +++ b/MIDI2LR.jucer @@ -1,6 +1,6 @@ -CFBundleSignature ???? CFBundleShortVersionString - 5.3.0.1 + 5.3.0.2 CFBundleVersion - 5.3.0.1 + 5.3.0.2 NSHumanReadableCopyright Copyright (C) 2015 by Rory Jaffe. NSHighResolutionCapable diff --git a/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj b/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj index ae5f1e954..6afbdeaca 100644 --- a/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj +++ b/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj @@ -516,8 +516,8 @@ "JUCE_STANDALONE_APPLICATION=1", "JUCE_MODAL_LOOPS_PERMITTED=1", "JUCER_XCODE_MAC_46BB2872=1", - "JUCE_APP_VERSION=5.3.0.1", - "JUCE_APP_VERSION_HEX=0x5030001", + "JUCE_APP_VERSION=5.3.0.2", + "JUCE_APP_VERSION_HEX=0x5030002", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", @@ -647,8 +647,8 @@ "JUCE_STANDALONE_APPLICATION=1", "JUCE_MODAL_LOOPS_PERMITTED=1", "JUCER_XCODE_MAC_46BB2872=1", - "JUCE_APP_VERSION=5.3.0.1", - "JUCE_APP_VERSION_HEX=0x5030001", + "JUCE_APP_VERSION=5.3.0.2", + "JUCE_APP_VERSION_HEX=0x5030002", "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 index eaad45807..f8bae3cc5 100644 --- a/build/Windows/MIDI2LR_App.vcxproj +++ b/build/Windows/MIDI2LR_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60105;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_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;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;JUCE_MODAL_LOOPS_PERMITTED=1;JUCER_VS2022_A3DCEFC2=1;JUCE_APP_VERSION=5.3.0.1;JUCE_APP_VERSION_HEX=0x5030001;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;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60105;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_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;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;JUCE_MODAL_LOOPS_PERMITTED=1;JUCER_VS2022_A3DCEFC2=1;JUCE_APP_VERSION=5.3.0.2;JUCE_APP_VERSION_HEX=0x5030002;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;%(PreprocessorDefinitions) MultiThreadedDebugDLL true NotUsing @@ -105,7 +105,7 @@ Full ..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60105;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_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;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;JUCE_MODAL_LOOPS_PERMITTED=1;JUCER_VS2022_A3DCEFC2=1;JUCE_APP_VERSION=5.3.0.1;JUCE_APP_VERSION_HEX=0x5030001;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;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60105;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_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;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;JUCE_MODAL_LOOPS_PERMITTED=1;JUCER_VS2022_A3DCEFC2=1;JUCE_APP_VERSION=5.3.0.2;JUCE_APP_VERSION_HEX=0x5030002;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;%(PreprocessorDefinitions) MultiThreaded true NotUsing diff --git a/build/Windows/resources.rc b/build/Windows/resources.rc index aa5092823..ddb975198 100644 --- a/build/Windows/resources.rc +++ b/build/Windows/resources.rc @@ -9,7 +9,7 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 5,3,0,1 +FILEVERSION 5,3,0,2 BEGIN BLOCK "StringFileInfo" BEGIN @@ -18,9 +18,9 @@ BEGIN VALUE "CompanyName", "Rory Jaffe\0" VALUE "LegalCopyright", "Copyright (C) 2015 by Rory Jaffe.\0" VALUE "FileDescription", "MIDI2LR\0" - VALUE "FileVersion", "5.3.0.1\0" + VALUE "FileVersion", "5.3.0.2\0" VALUE "ProductName", "MIDI2LR\0" - VALUE "ProductVersion", "5.3.0.1\0" + VALUE "ProductVersion", "5.3.0.2\0" END END diff --git a/external/JuceLibraryCode/JuceHeader.h b/external/JuceLibraryCode/JuceHeader.h index d94658e21..fc88d6d02 100644 --- a/external/JuceLibraryCode/JuceHeader.h +++ b/external/JuceLibraryCode/JuceHeader.h @@ -38,7 +38,7 @@ namespace ProjectInfo { const char* const projectName = "MIDI2LR"; const char* const companyName = "Rory Jaffe"; - const char* const versionString = "5.3.0.1"; - const int versionNumber = 0x5030001; + const char* const versionString = "5.3.0.2"; + const int versionNumber = 0x5030002; } #endif diff --git a/src/plugin/Info.lua b/src/plugin/Info.lua index 5979c8178..f9010c20e 100644 --- a/src/plugin/Info.lua +++ b/src/plugin/Info.lua @@ -95,5 +95,5 @@ return { file = "LogSave.lua", }, }, - VERSION = { major=5, minor=3, revision=0, build=1} + VERSION = { major=5, minor=3, revision=0, build=2} } diff --git a/tools/doxygen/Midi2lr.Doxyfile b/tools/doxygen/Midi2lr.Doxyfile index ff091e940..30b28abaa 100644 --- a/tools/doxygen/Midi2lr.Doxyfile +++ b/tools/doxygen/Midi2lr.Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = MIDI2LR # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 5.3.0.1 +PROJECT_NUMBER = 5.3.0.2 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/installer/MIDI2LR.xml b/tools/installer/MIDI2LR.xml index 2bfcfb60f..0f7948153 100644 --- a/tools/installer/MIDI2LR.xml +++ b/tools/installer/MIDI2LR.xml @@ -1,7 +1,7 @@ MIDI2LR MIDI2LR - 5.3.0.1 + 5.3.0.2 ${product_shortname}-${product_version}-${debuglabel}${platform_name}-installer.${platform_exec_suffix} data/translations/ReadMe.txt ../../LICENSE.txt From 9ff8f4a9274b73939aa93dbb24de7acd0ae2067f Mon Sep 17 00:00:00 2001 From: Rory Jaffe Date: Tue, 1 Feb 2022 13:10:24 -0800 Subject: [PATCH 2/3] revert c++20 changes --- src/application/Profile.cpp | 4 +++- src/application/Profile.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/application/Profile.cpp b/src/application/Profile.cpp index 6cf2af73a..c24ded43d 100644 --- a/src/application/Profile.cpp +++ b/src/application/Profile.cpp @@ -190,7 +190,9 @@ void Profile::RemoveUnassignedMessages() profile_unsaved_ = true; do { message_map_.erase(it->second); - std::erase(command_table_, it->second); + command_table_.erase( + std::remove(command_table_.begin(), command_table_.end(), it->second), + command_table_.end()); command_string_map_.erase(it); it = command_string_map_.find("Unassigned"); } while (it != command_string_map_.end()); diff --git a/src/application/Profile.h b/src/application/Profile.h index 75dfdc0bd..980ddc078 100644 --- a/src/application/Profile.h +++ b/src/application/Profile.h @@ -82,7 +82,7 @@ inline void Profile::AddCommandForMessage(size_t command, rsj::MidiMessageId mes inline bool Profile::CommandHasAssociatedMessage(const std::string& command) const { auto guard {std::shared_lock {mutex_}}; - return command_string_map_.contains(command); + return command_string_map_.find(command) != command_string_map_.end(); } inline const std::string& Profile::GetCommandForMessage(rsj::MidiMessageId message) const @@ -122,7 +122,7 @@ inline bool Profile::MessageExistsInMap(rsj::MidiMessageId message) const inline bool Profile::MessageExistsInMapI(rsj::MidiMessageId message) const { - return message_map_.contains(message); + return message_map_.find(message) != message_map_.end(); } inline bool Profile::ProfileUnsaved() const From 010fdd68f3b4a131e86e81516f5eca45aadab824 Mon Sep 17 00:00:00 2001 From: Rory Jaffe Date: Tue, 1 Feb 2022 15:40:00 -0800 Subject: [PATCH 3/3] C++17 build for macos --- build/MacOS/MIDI2LR.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj b/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj index 6afbdeaca..0bd298f58 100644 --- a/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj +++ b/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj @@ -470,7 +470,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "c++20"; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_LINK_OBJC_RUNTIME = NO; CODE_SIGN_ENTITLEMENTS = "App.entitlements"; @@ -601,7 +601,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "c++20"; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_LINK_OBJC_RUNTIME = NO; CODE_SIGN_ENTITLEMENTS = "App.entitlements";