Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@rsjaffe
rsjaffe committed Feb 2, 2022
2 parents 6ae000b + 010fdd6 commit 527839a
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 22 deletions.
2 changes: 1 addition & 1 deletion MIDI2LR.jucer
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="5.3.0.1"
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="5.3.0.2"
bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
companyWebsite="http://rsjaffe.github.io/MIDI2LR/" companyEmail="rsjaffe@gmail.com"
displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"
Expand Down
4 changes: 2 additions & 2 deletions build/MacOS/Info-App.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>5.3.0.1</string>
<string>5.3.0.2</string>
<key>CFBundleVersion</key>
<string>5.3.0.1</string>
<string>5.3.0.2</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (C) 2015 by Rory Jaffe.</string>
<key>NSHighResolutionCapable</key>
Expand Down
12 changes: 6 additions & 6 deletions build/MacOS/MIDI2LR.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions build/Windows/MIDI2LR_App.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<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.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)</PreprocessorDefinitions>
<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)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
Expand Down Expand Up @@ -105,7 +105,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<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.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)</PreprocessorDefinitions>
<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)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
Expand Down
6 changes: 3 additions & 3 deletions build/Windows/resources.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <windows.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 5,3,0,1
FILEVERSION 5,3,0,2
BEGIN
BLOCK "StringFileInfo"
BEGIN
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions external/JuceLibraryCode/JuceHeader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion src/application/Profile.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions src/application/Profile.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/plugin/Info.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
}
2 changes: 1 addition & 1 deletion tools/doxygen/Midi2lr.Doxyfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/installer/MIDI2LR.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project>
<shortName>MIDI2LR</shortName>
<fullName>MIDI2LR</fullName>
<version>5.3.0.1</version>
<version>5.3.0.2</version>
<installerFilename>${product_shortname}-${product_version}-${debuglabel}${platform_name}-installer.${platform_exec_suffix}</installerFilename>
<readmeFile>data/translations/ReadMe.txt</readmeFile>
<licenseFile>../../LICENSE.txt</licenseFile>
Expand Down

0 comments on commit 527839a

Please sign in to comment.