Skip to content

Commit 058cb83

Browse files
rsjaffersjaffe
committed
Merge branch 'develop'
2 parents 527839a + ecb3247 commit 058cb83

File tree

948 files changed

+32889
-8045
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

948 files changed

+32889
-8045
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,3 +369,5 @@ tools/selene/selene.txt
369369
*.favdoc
370370

371371
*.suppress
372+
373+
build/Windows/StructLayoutSettings.json

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
os: osx
2-
osx_image: xcode13.1
2+
osx_image: xcode13.3
33
before_install:
44
- gem install xcpretty
55
- gem install xcpretty-travis-formatter

‎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.2"
3+
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="5.4.0.0"
44
bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
55
companyWebsite="http://rsjaffe.github.io/MIDI2LR/" companyEmail="[email protected]"
66
displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"

‎README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
It processes MIDI input into develop parameter updates and photo actions, and sends MIDI output when parameters are changed for motorized feedback (on controllers that have motorized faders). [A listing of available Lightroom commands is in the Wiki](https://github.com/rsjaffe/MIDI2LR/wiki/Commands). Assistance on the code and design is welcome.
88

9-
MIDI2LR supports all languages Lightroom supports: Deutsch, English, español, français, italiano, 日本語, 한국어, Nederlands, português, русский, Svenska, ภาษาไทย and 中文 (简体中文和繁體中文).
9+
MIDI2LR supports all languages Lightroom supports: Deutsch, English, español, français, हिन्दी, italiano, 日本語, 한국어, Nederlands, norsk, polski, português, русский, Svenska, ภาษาไทย and 中文 (简体中文和繁體中文). इंस्टॉलर हिंदी का समर्थन नहीं करता है। हालांकि, आवेदन करता है। MIDI2LR इंस्टॉलर के लिए उपयोग की जाने वाली भाषा की परवाह किए बिना सभी भाषाओं का समर्थन करता है।
1010

1111
Translation assistance welcome. Sign up at https://poeditor.com/join/project?hash=v6U0MvufAn.
1212

@@ -15,10 +15,13 @@ Translation assistance welcome. Sign up at https://poeditor.com/join/project?has
1515
[Unterstützen Sie die Projektentwicklung mit Ihrer Spende](https://paypal.me/MIDI2LR)<br />
1616
[Donación para ayuda al desarrollo de proyectos](https://paypal.me/MIDI2LR)<br />
1717
[Faire un don pour encourager le développement du projet](https://paypal.me/MIDI2LR)<br />
18+
[प्रोजेक्‍ट विकास के समर्थन के लिए दान करें](https://paypal.me/MIDI2LR)<br />
1819
[Dona per supportare lo sviluppo del progetto](https://paypal.me/MIDI2LR)<br />
1920
[プロジェクト開発をサポートするための寄付をお願いします](https://paypal.me/MIDI2LR)<br />
2021
[프로젝트 개발 지원을 위해 기부](https://paypal.me/MIDI2LR)<br />
2122
[Doneren om projectontwikkeling te steunen](https://paypal.me/MIDI2LR)<br />
23+
[Doner for å støtte prosjektutvikling](https://paypal.me/MIDI2LR)<br />
24+
[Przekaż dotację na prace nad projektem](https://paypal.me/MIDI2LR)<br />
2225
[Doar para apoiar o desenvolvimento de projetos](https://paypal.me/MIDI2LR)<br />
2326
[Перевести деньги, чтобы поддержать разработку проекта](https://paypal.me/MIDI2LR)<br />
2427
[Donera för att stödja projektutveckling](https://paypal.me/MIDI2LR)<br />

‎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.2</string>
23+
<string>5.4.0.0</string>
2424
<key>CFBundleVersion</key>
25-
<string>5.3.0.2</string>
25+
<string>5.4.0.0</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: 8 additions & 8 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++17";
473+
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
474474
CLANG_CXX_LIBRARY = "libc++";
475475
CLANG_LINK_OBJC_RUNTIME = NO;
476476
CODE_SIGN_ENTITLEMENTS = "App.entitlements";
@@ -489,7 +489,7 @@
489489
"NDEBUG=1",
490490
"JUCE_DISPLAY_SPLASH_SCREEN=0",
491491
"JUCE_USE_DARK_SPLASH_SCREEN=1",
492-
"JUCE_PROJUCER_VERSION=0x60105",
492+
"JUCE_PROJUCER_VERSION=0x60106",
493493
"JUCE_MODULE_AVAILABLE_juce_audio_basics=1",
494494
"JUCE_MODULE_AVAILABLE_juce_audio_devices=1",
495495
"JUCE_MODULE_AVAILABLE_juce_core=1",
@@ -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.2",
520-
"JUCE_APP_VERSION_HEX=0x5030002",
519+
"JUCE_APP_VERSION=5.4.0.0",
520+
"JUCE_APP_VERSION_HEX=0x5040000",
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++17";
604+
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
605605
CLANG_CXX_LIBRARY = "libc++";
606606
CLANG_LINK_OBJC_RUNTIME = NO;
607607
CODE_SIGN_ENTITLEMENTS = "App.entitlements";
@@ -620,7 +620,7 @@
620620
"DEBUG=1",
621621
"JUCE_DISPLAY_SPLASH_SCREEN=0",
622622
"JUCE_USE_DARK_SPLASH_SCREEN=1",
623-
"JUCE_PROJUCER_VERSION=0x60105",
623+
"JUCE_PROJUCER_VERSION=0x60106",
624624
"JUCE_MODULE_AVAILABLE_juce_audio_basics=1",
625625
"JUCE_MODULE_AVAILABLE_juce_audio_devices=1",
626626
"JUCE_MODULE_AVAILABLE_juce_core=1",
@@ -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.2",
651-
"JUCE_APP_VERSION_HEX=0x5030002",
650+
"JUCE_APP_VERSION=5.4.0.0",
651+
"JUCE_APP_VERSION_HEX=0x5040000",
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.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>
67+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60106;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.4.0.0;JUCE_APP_VERSION_HEX=0x5040000;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.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>
108+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60106;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.4.0.0;JUCE_APP_VERSION_HEX=0x5040000;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/MIDI2LR_App.vcxproj.filters

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,4 @@
248248
<Filter>JUCE Library Code</Filter>
249249
</ResourceCompile>
250250
</ItemGroup>
251-
<ItemGroup>
252-
<Natvis Include="..\..\external\gsl\GSL.natvis" />
253-
</ItemGroup>
254-
</Project>
251+
</Project>

‎build/Windows/StructLayoutSettings.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"ExtractionTool": 0,
3+
"AutomaticExtraction": true,
4+
"CMakeCommandsFile": "",
5+
"AdditionalPreprocessorDefinitions": "",
6+
"AdditionalIncludeDirs": "",
7+
"AdditionalForceIncludes": "",
8+
"AdditionalCommandLine": "",
9+
"EnableWarnings": false,
10+
"PDBLocation": "",
11+
"ParserOutputFolder": ""
12+
}

‎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,2
12+
FILEVERSION 5,4,0,0
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.2\0"
21+
VALUE "FileVersion", "5.4.0.0\0"
2222
VALUE "ProductName", "MIDI2LR\0"
23-
VALUE "ProductVersion", "5.3.0.2\0"
23+
VALUE "ProductVersion", "5.4.0.0\0"
2424
END
2525
END
2626

0 commit comments

Comments
 (0)