diff --git a/Builds/MacOSX/Info-App.plist b/Builds/MacOSX/Info-App.plist index 4800e21b3..26b9b9c90 100644 --- a/Builds/MacOSX/Info-App.plist +++ b/Builds/MacOSX/Info-App.plist @@ -20,9 +20,9 @@ CFBundleSignature ???? CFBundleShortVersionString - 3.4.8.0 + 3.4.9.1 CFBundleVersion - 3.4.8.0 + 3.4.9.1 NSHumanReadableCopyright NSHighResolutionCapable diff --git a/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj b/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj index 8f3b5c84e..1038066c2 100644 --- a/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj +++ b/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj @@ -1029,8 +1029,8 @@ "DONT_SET_USING_JUCE_NAMESPACE=1", "GSL_THROW_ON_CONTRACT_VIOLATION=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=3.4.8.0", - "JUCE_APP_VERSION_HEX=0x3040800", + "JUCE_APP_VERSION=3.4.9.1", + "JUCE_APP_VERSION_HEX=0x3040901", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", @@ -1082,8 +1082,8 @@ "DONT_SET_USING_JUCE_NAMESPACE=1", "GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=3.4.8.0", - "JUCE_APP_VERSION_HEX=0x3040800", + "JUCE_APP_VERSION=3.4.9.1", + "JUCE_APP_VERSION_HEX=0x3040901", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", diff --git a/Builds/VisualStudio2019/MIDI2LR_App.vcxproj b/Builds/VisualStudio2019/MIDI2LR_App.vcxproj index 51f02b400..e3591f1e8 100644 --- a/Builds/VisualStudio2019/MIDI2LR_App.vcxproj +++ b/Builds/VisualStudio2019/MIDI2LR_App.vcxproj @@ -65,7 +65,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../asio/;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;DONT_SET_USING_JUCE_NAMESPACE=1;GSL_THROW_ON_CONTRACT_VIOLATION=1;_WIN32_WINNT=0x0601;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=3.4.8.0;JUCE_APP_VERSION_HEX=0x3040800;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;DONT_SET_USING_JUCE_NAMESPACE=1;GSL_THROW_ON_CONTRACT_VIOLATION=1;_WIN32_WINNT=0x0601;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=3.4.9.1;JUCE_APP_VERSION_HEX=0x3040901;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) MultiThreadedDebug true @@ -106,7 +106,7 @@ Full ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../asio/;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;DONT_SET_USING_JUCE_NAMESPACE=1;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;_WIN32_WINNT=0x0601;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=3.4.8.0;JUCE_APP_VERSION_HEX=0x3040800;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;DONT_SET_USING_JUCE_NAMESPACE=1;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;_WIN32_WINNT=0x0601;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=3.4.9.1;JUCE_APP_VERSION_HEX=0x3040901;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 diff --git a/Builds/VisualStudio2019/resources.rc b/Builds/VisualStudio2019/resources.rc index 6110d92e4..ae3629164 100644 --- a/Builds/VisualStudio2019/resources.rc +++ b/Builds/VisualStudio2019/resources.rc @@ -7,16 +7,16 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 3,4,8,0 +FILEVERSION 3,4,9,1 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN VALUE "FileDescription", "MIDI2LR\0" - VALUE "FileVersion", "3.4.8.0\0" + VALUE "FileVersion", "3.4.9.1\0" VALUE "ProductName", "MIDI2LR\0" - VALUE "ProductVersion", "3.4.8.0\0" + VALUE "ProductVersion", "3.4.9.1\0" END END diff --git a/DoxyGen/Midi2lr.Doxyfile b/DoxyGen/Midi2lr.Doxyfile index 5da2dd23f..a80f75fda 100644 --- a/DoxyGen/Midi2lr.Doxyfile +++ b/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 = 3.4.8.0 +PROJECT_NUMBER = 3.4.9.1 # 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/Installer/MIDI2LR.xml b/Installer/MIDI2LR.xml index 149e46197..eddc4f18e 100644 --- a/Installer/MIDI2LR.xml +++ b/Installer/MIDI2LR.xml @@ -1,7 +1,7 @@ MIDI2LR MIDI2LR - 3.4.8.0 + 3.4.9.1 ${product_shortname}-${product_version}-${debuglabel}${platform_name}-installer.${platform_exec_suffix} ../Source/LRPlugin/ReadMe.txt ../LICENSE.txt diff --git a/JuceLibraryCode/JuceHeader.h b/JuceLibraryCode/JuceHeader.h index 4fdeb0ac1..2898e7de1 100644 --- a/JuceLibraryCode/JuceHeader.h +++ b/JuceLibraryCode/JuceHeader.h @@ -44,7 +44,7 @@ namespace ProjectInfo { const char* const projectName = "MIDI2LR"; const char* const companyName = ""; - const char* const versionString = "3.4.8.0"; - const int versionNumber = 0x3040800; + const char* const versionString = "3.4.9.1"; + const int versionNumber = 0x3040901; } #endif diff --git a/MIDI2LR.jucer b/MIDI2LR.jucer index 1c4e6a63f..2e9687ea1 100644 --- a/MIDI2LR.jucer +++ b/MIDI2LR.jucer @@ -1,6 +1,6 @@ -> rsj::GetKeyMap() { std::shared_lock lock(mtx); diff --git a/Source/LRPlugin/MIDI2LR.lrplugin/Info.lua b/Source/LRPlugin/MIDI2LR.lrplugin/Info.lua index 14d90d0b9..2d829d57f 100644 --- a/Source/LRPlugin/MIDI2LR.lrplugin/Info.lua +++ b/Source/LRPlugin/MIDI2LR.lrplugin/Info.lua @@ -87,5 +87,5 @@ return { file = "About.lua", }, }, - VERSION = { major=3, minor=4, revision=8, build=0} + VERSION = { major=3, minor=4, revision=9, build=1} } diff --git a/Source/Main.cpp b/Source/Main.cpp index 8bfdc2878..6e4e1e98e 100644 --- a/Source/Main.cpp +++ b/Source/Main.cpp @@ -47,7 +47,6 @@ namespace fs = std::filesystem; #include "MIDIReceiver.h" #include "MIDISender.h" #include "Misc.h" -#include "Ocpp.h" #include "Profile.h" #include "ProfileManager.h" #include "PWoptions.h" @@ -147,10 +146,6 @@ class MIDI2LRApplication final : public juce::JUCEApplication { lr_ipc_in_.Start(); /* Check for latest version */ version_checker_.startThread(); -#ifndef _WIN32 - if (!juce::MessageManager::callAsync(rsj::FillInMessageLoop)) - rsj::Log("Unable to post FillInMessageLoop to message queue."); -#endif } else { quit(); diff --git a/Source/Ocpp.h b/Source/Ocpp.h index b9610d1d7..77f7cf4fd 100644 --- a/Source/Ocpp.h +++ b/Source/Ocpp.h @@ -30,6 +30,7 @@ namespace rsj { [[nodiscard]] UniChar Utf8ToUtf16(const std::string& param); void CheckPermission(pid_t pid); void FillInMessageLoop(); + bool FillInSucceeded(); } // namespace rsj #endif #endif