Skip to content

Commit 40392e1

Browse files
committed
Merge branch 'develop'
2 parents 7ebbd86 + 26a5ed0 commit 40392e1

File tree

1,630 files changed

+288529
-28087
lines changed

Some content is hidden

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

1,630 files changed

+288529
-28087
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* text=auto
55
*.sh text eol=lf
66
*.yml text eol=lf
7+
*.po text eol=lf
78
###############################################################################
89
# Diff behavior.
910
###############################################################################

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,3 +371,4 @@ tools/selene/selene.txt
371371
*.suppress
372372

373373
build/Windows/StructLayoutSettings.json
374+
*.mo

MIDI2LR.jucer

Lines changed: 5 additions & 5 deletions
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="6.1.0.0"
3+
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="6.2.0.1"
44
bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
55
companyWebsite="http://rsjaffe.github.io/MIDI2LR/" companyEmail="[email protected]"
66
displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"
@@ -105,14 +105,14 @@
105105
sendAppleEventsPermissionText="MIDI2LR needs to send keystrokes to Lightroom to help automate your tasks."
106106
xcodeValidArchs="arm64,x86_64" useLegacyBuildSystem="0" extraFrameworks="Carbon">
107107
<CONFIGURATIONS>
108-
<CONFIGURATION name="Debug" osxCompatibility="12.0 SDK" osxArchitecture="64BitIntel"
108+
<CONFIGURATION name="Debug" osxCompatibility="13.1 SDK" osxArchitecture="64BitIntel"
109109
binaryPath="" cppLanguageStandard="c++14" headerPath="../../external/asio/"
110110
codeSigningIdentity="Developer ID Application" recommendedWarnings="LLVM"
111-
isDebug="1" linkTimeOptimisation="0" optimisation="1" macOSDeploymentTarget="12.0"
111+
isDebug="1" linkTimeOptimisation="0" optimisation="1" macOSDeploymentTarget="13.1"
112112
fastMath="1"/>
113-
<CONFIGURATION name="Release" osxCompatibility="12.0 SDK" osxArchitecture="64BitIntel"
113+
<CONFIGURATION name="Release" osxCompatibility="13.1 SDK" osxArchitecture="64BitIntel"
114114
binaryPath="" cppLanguageStandard="c++14" headerPath="../../external/asio/"
115-
codeSigningIdentity="Developer ID Application" macOSDeploymentTarget="12.0"
115+
codeSigningIdentity="Developer ID Application" macOSDeploymentTarget="13.1"
116116
fastMath="1"/>
117117
</CONFIGURATIONS>
118118
<MODULEPATHS>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ It processes MIDI input into develop parameter updates and photo actions, and se
88

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

11-
Translation assistance welcome. Sign up at https://poeditor.com/join/project?hash=v6U0MvufAn.
11+
Translation assistance welcome. The po files are in MIDI2LR/tools/translation_work in the POE* directories.
1212

1313
## Support MIDI2LR 💸
1414
[Donate to support project development](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>6.1.0.0</string>
23+
<string>6.2.0.1</string>
2424
<key>CFBundleVersion</key>
25-
<string>6.1.0.0</string>
25+
<string>6.2.0.1</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: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@
4545
A1061B6E509742A3B9455642 /* Translate.cpp */ = {isa = PBXBuildFile; fileRef = E6F6D41D1E1EE0C8A33EFDF3; };
4646
A15A4BD0A3745D73BAEF62DB /* MIDIReceiver.cpp */ = {isa = PBXBuildFile; fileRef = 52C8A53647CE08544E8F9080; };
4747
A8ABB9C838EF80187E4AF420 /* KeyMap.mm */ = {isa = PBXBuildFile; fileRef = 3623B8285AF22A159F89DE61; };
48+
B99E8DEA6971A034BE365913 /* include_juce_core_CompilationTime.cpp */ = {isa = PBXBuildFile; fileRef = 2CEE99EA1E2C51EBBC2CFD25; };
4849
BDF535168645F120058193A9 /* RecentFilesMenuTemplate.nib */ = {isa = PBXBuildFile; fileRef = F3184CED9270796B369FA288; };
4950
C082CA7F6C0A89F20EFD8059 /* include_juce_data_structures.mm */ = {isa = PBXBuildFile; fileRef = F20F6CF6FB96E8AA2A4A7866; };
51+
CA90D924C721B9708BC7B30C /* include_juce_graphics_Harfbuzz.cpp */ = {isa = PBXBuildFile; fileRef = 1B0E217CF9B7EA2DF44721B4; };
5052
CF9729A29B45286C52F1822A /* include_juce_graphics.mm */ = {isa = PBXBuildFile; fileRef = 365A0F6673BAF87F63FD7A37; };
5153
D2702BEDFD96DEAEE2CDCE86 /* PWoptions.cpp */ = {isa = PBXBuildFile; fileRef = 8B58A8BC85D08C514E41CF9D; };
5254
D7E9C5BDDAFB6A9B70D194F8 /* CommandSet.cpp */ = {isa = PBXBuildFile; fileRef = C4713F8E964EC5E64A523FC8; };
@@ -75,9 +77,11 @@
7577
148BFB077DF1A1746D7624A0 /* MIDI2LR.png */ /* MIDI2LR.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = MIDI2LR.png; path = ../../data/application/MIDI2LR.png; sourceTree = SOURCE_ROOT; };
7678
1732433E668830E1BD0BA525 /* SendKeys.cpp */ /* SendKeys.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SendKeys.cpp; path = ../../src/application/SendKeys.cpp; sourceTree = SOURCE_ROOT; };
7779
1A5DF419DB203693F7898C6F /* MIDIReceiver.h */ /* MIDIReceiver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MIDIReceiver.h; path = ../../src/application/MIDIReceiver.h; sourceTree = SOURCE_ROOT; };
80+
1B0E217CF9B7EA2DF44721B4 /* include_juce_graphics_Harfbuzz.cpp */ /* include_juce_graphics_Harfbuzz.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_graphics_Harfbuzz.cpp; path = ../../external/JuceLibraryCode/include_juce_graphics_Harfbuzz.cpp; sourceTree = SOURCE_ROOT; };
7881
21C6B16D556E368BC28C907B /* CoreAudio.framework */ /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
7982
21CBC91AB996C894D915C8FC /* MetalKit.framework */ /* MetalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalKit.framework; path = System/Library/Frameworks/MetalKit.framework; sourceTree = SDKROOT; };
8083
2B65519DB9584C850A7E1B35 /* include_juce_audio_basics.mm */ /* include_juce_audio_basics.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_audio_basics.mm; path = ../../external/JuceLibraryCode/include_juce_audio_basics.mm; sourceTree = SOURCE_ROOT; };
84+
2CEE99EA1E2C51EBBC2CFD25 /* include_juce_core_CompilationTime.cpp */ /* include_juce_core_CompilationTime.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_core_CompilationTime.cpp; path = ../../external/JuceLibraryCode/include_juce_core_CompilationTime.cpp; sourceTree = SOURCE_ROOT; };
8185
3520273114C17F954392826D /* Translate.h */ /* Translate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Translate.h; path = ../../src/application/Translate.h; sourceTree = SOURCE_ROOT; };
8286
357B44B34E653363B6C68855 /* Cocoa.framework */ /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
8387
36229320761236DF640FFDB0 /* CommandTable.cpp */ /* CommandTable.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommandTable.cpp; path = ../../src/application/CommandTable.cpp; sourceTree = SOURCE_ROOT; };
@@ -315,9 +319,11 @@
315319
2B65519DB9584C850A7E1B35,
316320
C35CB58CDFC028B79850C032,
317321
8A1B5F83CBE85334B5E2FC87,
322+
2CEE99EA1E2C51EBBC2CFD25,
318323
F20F6CF6FB96E8AA2A4A7866,
319324
50BC033068609BDD0BAEEB5A,
320325
365A0F6673BAF87F63FD7A37,
326+
1B0E217CF9B7EA2DF44721B4,
321327
6B7E227A13331CBF571419B7,
322328
13D4CCAD080F52F17421CEAD,
323329
);
@@ -469,9 +475,11 @@
469475
E925E2E3F9BCFB41C9C4A9B6,
470476
8674F0122D7B0DF85FA66041,
471477
04C0D906A23C19EF1B0EBD8B,
478+
B99E8DEA6971A034BE365913,
472479
C082CA7F6C0A89F20EFD8059,
473480
734E72B3D95C5F2F18932250,
474481
CF9729A29B45286C52F1822A,
482+
CA90D924C721B9708BC7B30C,
475483
0EF26F147D52483D98B67EAF,
476484
);
477485
runOnlyForDeploymentPostprocessing = 0;
@@ -501,9 +509,7 @@
501509
GCC_PREPROCESSOR_DEFINITIONS = (
502510
"_NDEBUG=1",
503511
"NDEBUG=1",
504-
"JUCE_DISPLAY_SPLASH_SCREEN=0",
505-
"JUCE_USE_DARK_SPLASH_SCREEN=1",
506-
"JUCE_PROJUCER_VERSION=0x7000a",
512+
"JUCE_PROJUCER_VERSION=0x80001",
507513
"JUCE_MODULE_AVAILABLE_juce_audio_basics=1",
508514
"JUCE_MODULE_AVAILABLE_juce_audio_devices=1",
509515
"JUCE_MODULE_AVAILABLE_juce_core=1",
@@ -521,8 +527,8 @@
521527
"JUCE_STANDALONE_APPLICATION=1",
522528
"JUCE_MODAL_LOOPS_PERMITTED=1",
523529
"JUCER_XCODE_MAC_46BB2872=1",
524-
"JUCE_APP_VERSION=6.1.0.0",
525-
"JUCE_APP_VERSION_HEX=0x6010000",
530+
"JUCE_APP_VERSION=6.2.0.1",
531+
"JUCE_APP_VERSION_HEX=0x6020001",
526532
"JucePlugin_Build_VST=0",
527533
"JucePlugin_Build_VST3=0",
528534
"JucePlugin_Build_AU=0",
@@ -544,7 +550,7 @@
544550
INFOPLIST_PREPROCESS = NO;
545551
INSTALL_PATH = "$(HOME)/Applications";
546552
LLVM_LTO = YES;
547-
MACOSX_DEPLOYMENT_TARGET = 12.0;
553+
MACOSX_DEPLOYMENT_TARGET = 13.1;
548554
MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../external/JuceLibraryCode $(SRCROOT)/../../external/JuceLibraryCode/modules $(SRCROOT)/../../external/asio/ $(SRCROOT)/../../external/";
549555
PRODUCT_BUNDLE_IDENTIFIER = com.rsjaffe.MIDI2LR;
550556
PRODUCT_NAME = "MIDI2LR";
@@ -595,6 +601,7 @@
595601
GCC_WARN_UNINITIALIZED_AUTOS = YES;
596602
GCC_WARN_UNUSED_FUNCTION = YES;
597603
GCC_WARN_UNUSED_VARIABLE = YES;
604+
OTHER_CODE_SIGN_FLAGS = --timestamp;
598605
PRODUCT_NAME = "MIDI2LR";
599606
SDKROOT = macosx;
600607
WARNING_CFLAGS = "-Wreorder";
@@ -624,9 +631,7 @@
624631
GCC_PREPROCESSOR_DEFINITIONS = (
625632
"_DEBUG=1",
626633
"DEBUG=1",
627-
"JUCE_DISPLAY_SPLASH_SCREEN=0",
628-
"JUCE_USE_DARK_SPLASH_SCREEN=1",
629-
"JUCE_PROJUCER_VERSION=0x7000a",
634+
"JUCE_PROJUCER_VERSION=0x80001",
630635
"JUCE_MODULE_AVAILABLE_juce_audio_basics=1",
631636
"JUCE_MODULE_AVAILABLE_juce_audio_devices=1",
632637
"JUCE_MODULE_AVAILABLE_juce_core=1",
@@ -644,8 +649,8 @@
644649
"JUCE_STANDALONE_APPLICATION=1",
645650
"JUCE_MODAL_LOOPS_PERMITTED=1",
646651
"JUCER_XCODE_MAC_46BB2872=1",
647-
"JUCE_APP_VERSION=6.1.0.0",
648-
"JUCE_APP_VERSION_HEX=0x6010000",
652+
"JUCE_APP_VERSION=6.2.0.1",
653+
"JUCE_APP_VERSION_HEX=0x6020001",
649654
"JucePlugin_Build_VST=0",
650655
"JucePlugin_Build_VST3=0",
651656
"JucePlugin_Build_AU=0",
@@ -666,7 +671,7 @@
666671
INFOPLIST_FILE = Info-App.plist;
667672
INFOPLIST_PREPROCESS = NO;
668673
INSTALL_PATH = "$(HOME)/Applications";
669-
MACOSX_DEPLOYMENT_TARGET = 12.0;
674+
MACOSX_DEPLOYMENT_TARGET = 13.1;
670675
MTL_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../external/JuceLibraryCode $(SRCROOT)/../../external/JuceLibraryCode/modules $(SRCROOT)/../../external/asio/ $(SRCROOT)/../../external/";
671676
OTHER_CFLAGS = "-Wall -Wcast-align -Wfloat-equal -Wno-ignored-qualifiers -Wsign-compare -Wsign-conversion -Wstrict-aliasing -Wswitch-enum -Wuninitialized -Wunreachable-code -Wunused-parameter -Wmissing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wconversion -Wint-conversion -Wconditional-uninitialized -Wconstant-conversion -Wbool-conversion -Wextra-semi -Wshift-sign-overflow -Wmissing-prototypes -Wnullable-to-nonnull-conversion -Wpedantic -Wdeprecated -Wunguarded-availability -Wunguarded-availability-new";
672677
OTHER_CPLUSPLUSFLAGS = "-Woverloaded-virtual -Wreorder -Wzero-as-null-pointer-constant -Wunused-private-field -Winconsistent-missing-destructor-override -Wall -Wcast-align -Wfloat-equal -Wno-ignored-qualifiers -Wsign-compare -Wsign-conversion -Wstrict-aliasing -Wswitch-enum -Wuninitialized -Wunreachable-code -Wunused-parameter -Wmissing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wconversion -Wint-conversion -Wconditional-uninitialized -Wconstant-conversion -Wbool-conversion -Wextra-semi -Wshift-sign-overflow -Wmissing-prototypes -Wnullable-to-nonnull-conversion -Wpedantic -Wdeprecated -Wunguarded-availability -Wunguarded-availability-new";
@@ -719,6 +724,7 @@
719724
GCC_WARN_UNINITIALIZED_AUTOS = YES;
720725
GCC_WARN_UNUSED_FUNCTION = YES;
721726
GCC_WARN_UNUSED_VARIABLE = YES;
727+
OTHER_CODE_SIGN_FLAGS = --timestamp;
722728
PRODUCT_NAME = "MIDI2LR";
723729
SDKROOT = macosx;
724730
WARNING_CFLAGS = "-Wreorder";

0 commit comments

Comments
 (0)