Skip to content

Commit 9f33643

Browse files
rsjaffersjaffe
committed
Merge branch 'develop'
2 parents c5e0166 + c2a5251 commit 9f33643

File tree

9 files changed

+35
-38
lines changed

9 files changed

+35
-38
lines changed

‎Builds/MacOSX/Info-App.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<key>CFBundleSignature</key>
1919
<string>????</string>
2020
<key>CFBundleShortVersionString</key>
21-
<string>2.9.0.2</string>
21+
<string>2.9.0.3</string>
2222
<key>CFBundleVersion</key>
23-
<string>2.9.0.2</string>
23+
<string>2.9.0.3</string>
2424
<key>NSHumanReadableCopyright</key>
2525
<string></string>
2626
<key>NSHighResolutionCapable</key>

‎Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@
281281
"U_STATIC_IMPLEMENTATION=1",
282282
"GSL_THROW_ON_CONTRACT_VIOLATION=1",
283283
"JUCER_XCODE_MAC_F6D2F4CF=1",
284-
"JUCE_APP_VERSION=2.9.0.2",
285-
"JUCE_APP_VERSION_HEX=0x2090002",
284+
"JUCE_APP_VERSION=2.9.0.3",
285+
"JUCE_APP_VERSION_HEX=0x2090003",
286286
"JucePlugin_Build_VST=0",
287287
"JucePlugin_Build_VST3=0",
288288
"JucePlugin_Build_AU=0",
@@ -316,8 +316,8 @@
316316
"U_STATIC_IMPLEMENTATION=1",
317317
"GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1",
318318
"JUCER_XCODE_MAC_F6D2F4CF=1",
319-
"JUCE_APP_VERSION=2.9.0.2",
320-
"JUCE_APP_VERSION_HEX=0x2090002",
319+
"JUCE_APP_VERSION=2.9.0.3",
320+
"JUCE_APP_VERSION_HEX=0x2090003",
321321
"JucePlugin_Build_VST=0",
322322
"JucePlugin_Build_VST3=0",
323323
"JucePlugin_Build_AU=0",

‎Builds/VisualStudio2017/MIDI2LR_App.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<Optimization>Disabled</Optimization>
7676
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
7777
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
78-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;U_STATIC_IMPLEMENTATION=1;GSL_THROW_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.0.2;JUCE_APP_VERSION_HEX=0x2090002;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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
78+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;U_STATIC_IMPLEMENTATION=1;GSL_THROW_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.0.3;JUCE_APP_VERSION_HEX=0x2090003;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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7979
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
8080
<RuntimeTypeInfo>true</RuntimeTypeInfo>
8181
<PrecompiledHeader/>
@@ -116,7 +116,7 @@
116116
<ClCompile>
117117
<Optimization>Full</Optimization>
118118
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;U_STATIC_IMPLEMENTATION=1;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.0.2;JUCE_APP_VERSION_HEX=0x2090002;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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
119+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;U_STATIC_IMPLEMENTATION=1;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.9.0.3;JUCE_APP_VERSION_HEX=0x2090003;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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
120120
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
121121
<RuntimeTypeInfo>true</RuntimeTypeInfo>
122122
<PrecompiledHeader/>

‎Builds/VisualStudio2017/resources.rc‎

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

99
VS_VERSION_INFO VERSIONINFO
10-
FILEVERSION 2,9,0,2
10+
FILEVERSION 2,9,0,3
1111
BEGIN
1212
BLOCK "StringFileInfo"
1313
BEGIN
1414
BLOCK "040904E4"
1515
BEGIN
1616
VALUE "FileDescription", "MIDI2LR\0"
17-
VALUE "FileVersion", "2.9.0.2\0"
17+
VALUE "FileVersion", "2.9.0.3\0"
1818
VALUE "ProductName", "MIDI2LR\0"
19-
VALUE "ProductVersion", "2.9.0.2\0"
19+
VALUE "ProductVersion", "2.9.0.3\0"
2020
END
2121
END
2222

‎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 = 2.9.0.2
41+
PROJECT_NUMBER = 2.9.0.3
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

‎Installer/MIDI2LR.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<project>
22
<shortName>MIDI2LR</shortName>
33
<fullName>MIDI2LR</fullName>
4-
<version>2.9.0.2</version>
4+
<version>2.9.0.3</version>
55
<readmeFile>../Source/LRPlugin/ReadMe.txt</readmeFile>
66
<licenseFile>../LICENSE.txt</licenseFile>
77
<htmlLicenseFile>LICENSE.html</htmlLicenseFile>

‎JuceLibraryCode/JuceHeader.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
namespace ProjectInfo
3535
{
3636
const char* const projectName = "MIDI2LR";
37-
const char* const versionString = "2.9.0.2";
38-
const int versionNumber = 0x2090002;
37+
const char* const versionString = "2.9.0.3";
38+
const int versionNumber = 0x2090003;
3939
}
4040
#endif

‎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="2.9.0.2"
3+
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="2.9.0.3"
44
bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
55
jucerVersion="5.2.1" companyWebsite="http://rsjaffe.github.io/MIDI2LR/"
66
companyEmail="rsjaffe@gmail.com" displaySplashScreen="0" reportAppUsage="0"

‎Source/LRPlugin/MIDI2LR.lrplugin/KeyShortcuts.lua‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -57,28 +57,6 @@ MIDI2LRkeyNames[LOC("$$$/Win/MenuDisplay/KeyboardShortcutElement/Space=Space")]
5757
MIDI2LRkeyNames[LOC("$$$/Win/MenuDisplay/KeyboardShortcutElement/Tab=Tab")] = 'tab'
5858
MIDI2LRkeyNames[LOC("$$$/Win/MenuDisplay/KeyboardShortcutElement/Up=Up")] = 'cursor up'
5959

60-
--use shift key instead of shifted key value as have trouble on Mac getting keycode for shifted key
61-
local KeyCode = { -- format from translation list is Cmd+Shift+Option+r , where 'r' is the key
62-
BrushDecreaseKey = LRkeytoCode("$$$/AgDevelop/Localized/BrushDecreaseKey=["),
63-
BrushDecreaseKeyShifted = LRkeytoCode("$$$/AgDevelop/Localized/BrushDecreaseKey=[",0x4),
64-
BrushIncreaseKey = LRkeytoCode("$$$/AgDevelop/Localized/BrushIncreaseKey=]"),
65-
BrushIncreaseKeyShifted = LRkeytoCode("$$$/AgDevelop/Localized/BrushIncreaseKey=]",0x4),
66-
CopyKey = LRkeytoCode("$$$/AgLayout/Menu/Edit/Copy/Key=Cmd+c"),
67-
CycleAdjustmentBrushOverlayKey = LRkeytoCode("$$$/AgDevelop/Menu/View/CycleAdjustmentBrushOverlay/Key=Shift+o"),
68-
PasteKey = LRkeytoCode("$$$/AgLayout/Menu/Edit/Paste/Key=Cmd+v"),
69-
SliderDecreaseKey = "0cursor left",
70-
SliderIncreaseKey = "0cursor right",
71-
ShowAdjustmentBrushOverlayKey = LRkeytoCode("$$$/AgDevelop/Menu/View/ShowHideAdjustmentBrushOverlay/Key=o"),
72-
UndoKey = LRkeytoCode("$$$/Application/Menu/Edit/Undo/Key=Cmd+z"),
73-
}
74-
75-
if(WIN_ENV) then -- shortcuts that differ between Mac and PC
76-
KeyCode.RedoKey = LRkeytoCode("$$$/Application/Menu/Edit/RedoWin/Key=Cmd+y")
77-
else
78-
KeyCode.RedoKey = LRkeytoCode("$$$/Application/Menu/Edit/Redo/Key=Cmd+Shift+z")
79-
end
80-
81-
8260
local function LRkeytoCode(arg1,addmodifier)
8361
local mystring = LOC(arg1)
8462
local KeyValue --default nil
@@ -102,7 +80,26 @@ local function LRkeytoCode(arg1,addmodifier)
10280
return ModifierValue..KeyValue
10381
end
10482

83+
--use shift key instead of shifted key value as have trouble on Mac getting keycode for shifted key
84+
local KeyCode = { -- format from translation list is Cmd+Shift+Option+r , where 'r' is the key
85+
BrushDecreaseKey = LRkeytoCode("$$$/AgDevelop/Localized/BrushDecreaseKey=["),
86+
BrushDecreaseKeyShifted = LRkeytoCode("$$$/AgDevelop/Localized/BrushDecreaseKey=[",0x4),
87+
BrushIncreaseKey = LRkeytoCode("$$$/AgDevelop/Localized/BrushIncreaseKey=]"),
88+
BrushIncreaseKeyShifted = LRkeytoCode("$$$/AgDevelop/Localized/BrushIncreaseKey=]",0x4),
89+
CopyKey = LRkeytoCode("$$$/AgLayout/Menu/Edit/Copy/Key=Cmd+c"),
90+
CycleAdjustmentBrushOverlayKey = LRkeytoCode("$$$/AgDevelop/Menu/View/CycleAdjustmentBrushOverlay/Key=Shift+o"),
91+
PasteKey = LRkeytoCode("$$$/AgLayout/Menu/Edit/Paste/Key=Cmd+v"),
92+
SliderDecreaseKey = "0cursor left",
93+
SliderIncreaseKey = "0cursor right",
94+
ShowAdjustmentBrushOverlayKey = LRkeytoCode("$$$/AgDevelop/Menu/View/ShowHideAdjustmentBrushOverlay/Key=o"),
95+
UndoKey = LRkeytoCode("$$$/Application/Menu/Edit/Undo/Key=Cmd+z"),
96+
}
10597

98+
if(WIN_ENV) then -- shortcuts that differ between Mac and PC
99+
KeyCode.RedoKey = LRkeytoCode("$$$/Application/Menu/Edit/RedoWin/Key=Cmd+y")
100+
else
101+
KeyCode.RedoKey = LRkeytoCode("$$$/Application/Menu/Edit/Redo/Key=Cmd+Shift+z")
102+
end
106103

107104
return {
108105
KeyCode = KeyCode,

0 commit comments

Comments
 (0)