Skip to content

Commit 527839a

Browse files
rsjaffersjaffe
committed
Merge branch 'develop'
2 parents 6ae000b + 010fdd6 commit 527839a

File tree

11 files changed

+24
-22
lines changed

11 files changed

+24
-22
lines changed

‎MIDI2LR.jucer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="5.3.0.1"
3+
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="5.3.0.2"
44
bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
55
companyWebsite="http://rsjaffe.github.io/MIDI2LR/" companyEmail="[email protected]"
66
displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"

‎build/MacOS/Info-App.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
<key>CFBundleSignature</key>
2121
<string>????</string>
2222
<key>CFBundleShortVersionString</key>
23-
<string>5.3.0.1</string>
23+
<string>5.3.0.2</string>
2424
<key>CFBundleVersion</key>
25-
<string>5.3.0.1</string>
25+
<string>5.3.0.2</string>
2626
<key>NSHumanReadableCopyright</key>
2727
<string>Copyright (C) 2015 by Rory Jaffe.</string>
2828
<key>NSHighResolutionCapable</key>

‎build/MacOS/MIDI2LR.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@
470470
isa = XCBuildConfiguration;
471471
buildSettings = {
472472
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
473-
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
473+
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
474474
CLANG_CXX_LIBRARY = "libc++";
475475
CLANG_LINK_OBJC_RUNTIME = NO;
476476
CODE_SIGN_ENTITLEMENTS = "App.entitlements";
@@ -516,8 +516,8 @@
516516
"JUCE_STANDALONE_APPLICATION=1",
517517
"JUCE_MODAL_LOOPS_PERMITTED=1",
518518
"JUCER_XCODE_MAC_46BB2872=1",
519-
"JUCE_APP_VERSION=5.3.0.1",
520-
"JUCE_APP_VERSION_HEX=0x5030001",
519+
"JUCE_APP_VERSION=5.3.0.2",
520+
"JUCE_APP_VERSION_HEX=0x5030002",
521521
"JucePlugin_Build_VST=0",
522522
"JucePlugin_Build_VST3=0",
523523
"JucePlugin_Build_AU=0",
@@ -601,7 +601,7 @@
601601
isa = XCBuildConfiguration;
602602
buildSettings = {
603603
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
604-
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
604+
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
605605
CLANG_CXX_LIBRARY = "libc++";
606606
CLANG_LINK_OBJC_RUNTIME = NO;
607607
CODE_SIGN_ENTITLEMENTS = "App.entitlements";
@@ -647,8 +647,8 @@
647647
"JUCE_STANDALONE_APPLICATION=1",
648648
"JUCE_MODAL_LOOPS_PERMITTED=1",
649649
"JUCER_XCODE_MAC_46BB2872=1",
650-
"JUCE_APP_VERSION=5.3.0.1",
651-
"JUCE_APP_VERSION_HEX=0x5030001",
650+
"JUCE_APP_VERSION=5.3.0.2",
651+
"JUCE_APP_VERSION_HEX=0x5030002",
652652
"JucePlugin_Build_VST=0",
653653
"JucePlugin_Build_VST3=0",
654654
"JucePlugin_Build_AU=0",

‎build/Windows/MIDI2LR_App.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<Optimization>Disabled</Optimization>
6565
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
6666
<AdditionalIncludeDirectories>..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
67-
<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>
67+
<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>
6868
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
6969
<RuntimeTypeInfo>true</RuntimeTypeInfo>
7070
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -105,7 +105,7 @@
105105
<ClCompile>
106106
<Optimization>Full</Optimization>
107107
<AdditionalIncludeDirectories>..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
108-
<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>
108+
<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>
109109
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
110110
<RuntimeTypeInfo>true</RuntimeTypeInfo>
111111
<PrecompiledHeader>NotUsing</PrecompiledHeader>

‎build/Windows/resources.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <windows.h>
1010

1111
VS_VERSION_INFO VERSIONINFO
12-
FILEVERSION 5,3,0,1
12+
FILEVERSION 5,3,0,2
1313
BEGIN
1414
BLOCK "StringFileInfo"
1515
BEGIN
@@ -18,9 +18,9 @@ BEGIN
1818
VALUE "CompanyName", "Rory Jaffe\0"
1919
VALUE "LegalCopyright", "Copyright (C) 2015 by Rory Jaffe.\0"
2020
VALUE "FileDescription", "MIDI2LR\0"
21-
VALUE "FileVersion", "5.3.0.1\0"
21+
VALUE "FileVersion", "5.3.0.2\0"
2222
VALUE "ProductName", "MIDI2LR\0"
23-
VALUE "ProductVersion", "5.3.0.1\0"
23+
VALUE "ProductVersion", "5.3.0.2\0"
2424
END
2525
END
2626

‎external/JuceLibraryCode/JuceHeader.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace ProjectInfo
3838
{
3939
const char* const projectName = "MIDI2LR";
4040
const char* const companyName = "Rory Jaffe";
41-
const char* const versionString = "5.3.0.1";
42-
const int versionNumber = 0x5030001;
41+
const char* const versionString = "5.3.0.2";
42+
const int versionNumber = 0x5030002;
4343
}
4444
#endif

‎src/application/Profile.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,9 @@ void Profile::RemoveUnassignedMessages()
190190
profile_unsaved_ = true;
191191
do {
192192
message_map_.erase(it->second);
193-
std::erase(command_table_, it->second);
193+
command_table_.erase(
194+
std::remove(command_table_.begin(), command_table_.end(), it->second),
195+
command_table_.end());
194196
command_string_map_.erase(it);
195197
it = command_string_map_.find("Unassigned");
196198
} while (it != command_string_map_.end());

‎src/application/Profile.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ inline void Profile::AddCommandForMessage(size_t command, rsj::MidiMessageId mes
8282
inline bool Profile::CommandHasAssociatedMessage(const std::string& command) const
8383
{
8484
auto guard {std::shared_lock {mutex_}};
85-
return command_string_map_.contains(command);
85+
return command_string_map_.find(command) != command_string_map_.end();
8686
}
8787

8888
inline const std::string& Profile::GetCommandForMessage(rsj::MidiMessageId message) const
@@ -122,7 +122,7 @@ inline bool Profile::MessageExistsInMap(rsj::MidiMessageId message) const
122122

123123
inline bool Profile::MessageExistsInMapI(rsj::MidiMessageId message) const
124124
{
125-
return message_map_.contains(message);
125+
return message_map_.find(message) != message_map_.end();
126126
}
127127

128128
inline bool Profile::ProfileUnsaved() const

‎src/plugin/Info.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,5 @@ return {
9595
file = "LogSave.lua",
9696
},
9797
},
98-
VERSION = { major=5, minor=3, revision=0, build=1}
98+
VERSION = { major=5, minor=3, revision=0, build=2}
9999
}

‎tools/doxygen/Midi2lr.Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = MIDI2LR
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 5.3.0.1
41+
PROJECT_NUMBER = 5.3.0.2
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

0 commit comments

Comments
 (0)