diff --git a/.travis.yml b/.travis.yml index 372799705..3b47a16bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ os: osx -osx_image: xcode12.5 +osx_image: xcode13.1 before_install: - gem install xcpretty - gem install xcpretty-travis-formatter diff --git a/MIDI2LR.jucer b/MIDI2LR.jucer index ab4e6aa4c..b4cab427d 100644 --- a/MIDI2LR.jucer +++ b/MIDI2LR.jucer @@ -1,6 +1,6 @@ -CFBundleSignature ???? CFBundleShortVersionString - 5.0.0.1 + 5.0.0.2 CFBundleVersion - 5.0.0.1 + 5.0.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 c9af74e41..e5a88620d 100644 --- a/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj +++ b/build/MacOS/MIDI2LR.xcodeproj/project.pbxproj @@ -515,8 +515,8 @@ "JUCE_STANDALONE_APPLICATION=1", "JUCE_MODAL_LOOPS_PERMITTED=1", "JUCER_XCODE_MAC_46BB2872=1", - "JUCE_APP_VERSION=5.0.0.1", - "JUCE_APP_VERSION_HEX=0x5000001", + "JUCE_APP_VERSION=5.0.0.2", + "JUCE_APP_VERSION_HEX=0x5000002", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", @@ -645,8 +645,8 @@ "JUCE_STANDALONE_APPLICATION=1", "JUCE_MODAL_LOOPS_PERMITTED=1", "JUCER_XCODE_MAC_46BB2872=1", - "JUCE_APP_VERSION=5.0.0.1", - "JUCE_APP_VERSION_HEX=0x5000001", + "JUCE_APP_VERSION=5.0.0.2", + "JUCE_APP_VERSION_HEX=0x5000002", "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 638c8aa2a..5e0b48dc8 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=0x60102;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_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=5.0.0.1;JUCE_APP_VERSION_HEX=0x5000001;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=0x60102;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_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=5.0.0.2;JUCE_APP_VERSION_HEX=0x5000002;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=0x60102;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_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=5.0.0.1;JUCE_APP_VERSION_HEX=0x5000001;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=0x60102;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_VS2019_A3DCEFC2=1;JUCE_APP_VERSION=5.0.0.2;JUCE_APP_VERSION_HEX=0x5000002;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 f52a8d9c0..8cbeeaf5e 100644 --- a/build/Windows/resources.rc +++ b/build/Windows/resources.rc @@ -9,7 +9,7 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 5,0,0,1 +FILEVERSION 5,0,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.0.0.1\0" + VALUE "FileVersion", "5.0.0.2\0" VALUE "ProductName", "MIDI2LR\0" - VALUE "ProductVersion", "5.0.0.1\0" + VALUE "ProductVersion", "5.0.0.2\0" END END diff --git a/external/JuceLibraryCode/JuceHeader.h b/external/JuceLibraryCode/JuceHeader.h index bb3b4e3ee..93588f71b 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.0.0.1"; - const int versionNumber = 0x5000001; + const char* const versionString = "5.0.0.2"; + const int versionNumber = 0x5000002; } #endif diff --git a/src/application/VersionChecker.cpp b/src/application/VersionChecker.cpp index 4f6a5a9a8..e0206a323 100644 --- a/src/application/VersionChecker.cpp +++ b/src/application/VersionChecker.cpp @@ -30,6 +30,7 @@ namespace { [[nodiscard]] std::string IntToVersion(unsigned int vers) { static_assert(std::is_unsigned_v, "Avoid sign extension"); + static_assert(sizeof vers >= 4, "At least 4 bytes"); const auto major {vers >> 24 & 0xFFU}; const auto minor {vers >> 16 & 0xFFU}; const auto rev {vers >> 8 & 0xFFU}; diff --git a/src/plugin/Info.lua b/src/plugin/Info.lua index 6c6ea9476..2ba7223e3 100644 --- a/src/plugin/Info.lua +++ b/src/plugin/Info.lua @@ -87,5 +87,5 @@ return { file = "About.lua", }, }, - VERSION = { major=5, minor=0, revision=0, build=1} + VERSION = { major=5, minor=0, revision=0, build=2} } diff --git a/src/plugin/LocalPresets.lua b/src/plugin/LocalPresets.lua index 9dc1133f0..3c51493e4 100644 --- a/src/plugin/LocalPresets.lua +++ b/src/plugin/LocalPresets.lua @@ -28,6 +28,7 @@ MIDI2LR. If not, see . exposure = 0, exposure2012 = 1, highlights2012 = 1, + hue = 1, luminanceNoise = 1, moire = 1, saturation = 1, @@ -36,9 +37,9 @@ MIDI2LR. If not, see . temperature = 1, texture = 1, tint = 1, - toningHue = 240, + toningHue = 327, toningLuminance = 0, - toningSaturation = 0, + toningSaturation = 1, whites2012 = 1, --]] @@ -74,7 +75,7 @@ local localPresetMap = { texture = "local_Texture", tint = "local_Tint", toningHue = "", --"local_ToningHue" doesn't exsist - toningLuminance = "local_ToningLuminance", + toningLuminance = "", -- "local_ToningLuminance" doesn't exist toningSaturation = "", --"local_ToningSaturation" doesn't exsist whites2012 = "local_Whites" } diff --git a/tools/doxygen/Midi2lr.Doxyfile b/tools/doxygen/Midi2lr.Doxyfile index 897566ffb..fa5a37ad9 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.0.0.1 +PROJECT_NUMBER = 5.0.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 0b1f84812..6232f7ca2 100644 --- a/tools/installer/MIDI2LR.xml +++ b/tools/installer/MIDI2LR.xml @@ -1,7 +1,7 @@ MIDI2LR MIDI2LR - 5.0.0.1 + 5.0.0.2 ${product_shortname}-${product_version}-${debuglabel}${platform_name}-installer.${platform_exec_suffix} data/translations/ReadMe.txt ../../LICENSE.txt