Merge branch 'develop'

rsjaffe · May 26, 2018 · 9f33643 · 9f33643
2 parents c5e0166 + c2a5251
commit 9f33643
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 38 deletions.
diff --git a/Builds/MacOSX/Info-App.plist b/Builds/MacOSX/Info-App.plist
@@ -18,9 +18,9 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.9.0.2</string>
+    <string>2.9.0.3</string>
     <key>CFBundleVersion</key>
-    <string>2.9.0.2</string>
+    <string>2.9.0.3</string>
     <key>NSHumanReadableCopyright</key>
     <string></string>
     <key>NSHighResolutionCapable</key>

diff --git a/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj b/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj
@@ -281,8 +281,8 @@
 					"U_STATIC_IMPLEMENTATION=1",
 					"GSL_THROW_ON_CONTRACT_VIOLATION=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
-					"JUCE_APP_VERSION=2.9.0.2",
-					"JUCE_APP_VERSION_HEX=0x2090002",
+					"JUCE_APP_VERSION=2.9.0.3",
+					"JUCE_APP_VERSION_HEX=0x2090003",
 					"JucePlugin_Build_VST=0",
 					"JucePlugin_Build_VST3=0",
 					"JucePlugin_Build_AU=0",
@@ -316,8 +316,8 @@
 					"U_STATIC_IMPLEMENTATION=1",
 					"GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
-					"JUCE_APP_VERSION=2.9.0.2",
-					"JUCE_APP_VERSION_HEX=0x2090002",
+					"JUCE_APP_VERSION=2.9.0.3",
+					"JUCE_APP_VERSION_HEX=0x2090003",
 					"JucePlugin_Build_VST=0",
 					"JucePlugin_Build_VST3=0",
 					"JucePlugin_Build_AU=0",

diff --git a/Builds/VisualStudio2017/MIDI2LR_App.vcxproj b/Builds/VisualStudio2017/MIDI2LR_App.vcxproj
@@ -75,7 +75,7 @@
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <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>
+      <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>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
@@ -116,7 +116,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <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>
+      <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>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>

diff --git a/Builds/VisualStudio2017/resources.rc b/Builds/VisualStudio2017/resources.rc
@@ -7,16 +7,16 @@
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION  2,9,0,2
+FILEVERSION  2,9,0,3
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
     BLOCK "040904E4"
     BEGIN
       VALUE "FileDescription",  "MIDI2LR\0"
-      VALUE "FileVersion",  "2.9.0.2\0"
+      VALUE "FileVersion",  "2.9.0.3\0"
       VALUE "ProductName",  "MIDI2LR\0"
-      VALUE "ProductVersion",  "2.9.0.2\0"
+      VALUE "ProductVersion",  "2.9.0.3\0"
     END
   END
 

diff --git 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         = 2.9.0.2
+PROJECT_NUMBER         = 2.9.0.3
 
 # 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
@@ -1,7 +1,7 @@
 <project>
     <shortName>MIDI2LR</shortName>
     <fullName>MIDI2LR</fullName>
-    <version>2.9.0.2</version>
+    <version>2.9.0.3</version>
     <readmeFile>../Source/LRPlugin/ReadMe.txt</readmeFile>
     <licenseFile>../LICENSE.txt</licenseFile>
     <htmlLicenseFile>LICENSE.html</htmlLicenseFile>

diff --git a/JuceLibraryCode/JuceHeader.h b/JuceLibraryCode/JuceHeader.h
@@ -34,7 +34,7 @@
 namespace ProjectInfo
 {
     const char* const  projectName    = "MIDI2LR";
-    const char* const  versionString  = "2.9.0.2";
-    const int          versionNumber  = 0x2090002;
+    const char* const  versionString  = "2.9.0.3";
+    const int          versionNumber  = 0x2090003;
 }
 #endif
diff --git a/MIDI2LR.jucer b/MIDI2LR.jucer
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="2.9.0.2"
+<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="2.9.0.3"
               bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
               jucerVersion="5.2.1" companyWebsite="http://rsjaffe.github.io/MIDI2LR/"
               companyEmail="rsjaffe@gmail.com" displaySplashScreen="0" reportAppUsage="0"

diff --git a/Source/LRPlugin/MIDI2LR.lrplugin/KeyShortcuts.lua b/Source/LRPlugin/MIDI2LR.lrplugin/KeyShortcuts.lua
@@ -57,28 +57,6 @@ MIDI2LRkeyNames[LOC("$$$/Win/MenuDisplay/KeyboardShortcutElement/Space=Space")]
 MIDI2LRkeyNames[LOC("$$$/Win/MenuDisplay/KeyboardShortcutElement/Tab=Tab")]             = 'tab'
 MIDI2LRkeyNames[LOC("$$$/Win/MenuDisplay/KeyboardShortcutElement/Up=Up")]               = 'cursor up'
 
---use shift key instead of shifted key value as have trouble on Mac getting keycode for shifted key
-local KeyCode = { -- format from translation list is Cmd+Shift+Option+r , where 'r' is the key
-  BrushDecreaseKey        = LRkeytoCode("$$$/AgDevelop/Localized/BrushDecreaseKey=["),
-  BrushDecreaseKeyShifted = LRkeytoCode("$$$/AgDevelop/Localized/BrushDecreaseKey=[",0x4),
-  BrushIncreaseKey        = LRkeytoCode("$$$/AgDevelop/Localized/BrushIncreaseKey=]"),
-  BrushIncreaseKeyShifted = LRkeytoCode("$$$/AgDevelop/Localized/BrushIncreaseKey=]",0x4),
-  CopyKey                 = LRkeytoCode("$$$/AgLayout/Menu/Edit/Copy/Key=Cmd+c"),
-  CycleAdjustmentBrushOverlayKey = LRkeytoCode("$$$/AgDevelop/Menu/View/CycleAdjustmentBrushOverlay/Key=Shift+o"),
-  PasteKey                = LRkeytoCode("$$$/AgLayout/Menu/Edit/Paste/Key=Cmd+v"),
-  SliderDecreaseKey       = "0cursor left",
-  SliderIncreaseKey       = "0cursor right",
-  ShowAdjustmentBrushOverlayKey = LRkeytoCode("$$$/AgDevelop/Menu/View/ShowHideAdjustmentBrushOverlay/Key=o"),
-  UndoKey                 = LRkeytoCode("$$$/Application/Menu/Edit/Undo/Key=Cmd+z"),
-}
-
-if(WIN_ENV) then -- shortcuts that differ between Mac and PC
-  KeyCode.RedoKey = LRkeytoCode("$$$/Application/Menu/Edit/RedoWin/Key=Cmd+y")
-else
-  KeyCode.RedoKey = LRkeytoCode("$$$/Application/Menu/Edit/Redo/Key=Cmd+Shift+z")
-end
-
-
 local function LRkeytoCode(arg1,addmodifier)
   local mystring = LOC(arg1)
   local KeyValue --default nil
@@ -102,7 +80,26 @@ local function LRkeytoCode(arg1,addmodifier)
   return ModifierValue..KeyValue
 end
 
+--use shift key instead of shifted key value as have trouble on Mac getting keycode for shifted key
+local KeyCode = { -- format from translation list is Cmd+Shift+Option+r , where 'r' is the key
+  BrushDecreaseKey        = LRkeytoCode("$$$/AgDevelop/Localized/BrushDecreaseKey=["),
+  BrushDecreaseKeyShifted = LRkeytoCode("$$$/AgDevelop/Localized/BrushDecreaseKey=[",0x4),
+  BrushIncreaseKey        = LRkeytoCode("$$$/AgDevelop/Localized/BrushIncreaseKey=]"),
+  BrushIncreaseKeyShifted = LRkeytoCode("$$$/AgDevelop/Localized/BrushIncreaseKey=]",0x4),
+  CopyKey                 = LRkeytoCode("$$$/AgLayout/Menu/Edit/Copy/Key=Cmd+c"),
+  CycleAdjustmentBrushOverlayKey = LRkeytoCode("$$$/AgDevelop/Menu/View/CycleAdjustmentBrushOverlay/Key=Shift+o"),
+  PasteKey                = LRkeytoCode("$$$/AgLayout/Menu/Edit/Paste/Key=Cmd+v"),
+  SliderDecreaseKey       = "0cursor left",
+  SliderIncreaseKey       = "0cursor right",
+  ShowAdjustmentBrushOverlayKey = LRkeytoCode("$$$/AgDevelop/Menu/View/ShowHideAdjustmentBrushOverlay/Key=o"),
+  UndoKey                 = LRkeytoCode("$$$/Application/Menu/Edit/Undo/Key=Cmd+z"),
+}
 
+if(WIN_ENV) then -- shortcuts that differ between Mac and PC
+  KeyCode.RedoKey = LRkeytoCode("$$$/Application/Menu/Edit/RedoWin/Key=Cmd+y")
+else
+  KeyCode.RedoKey = LRkeytoCode("$$$/Application/Menu/Edit/Redo/Key=Cmd+Shift+z")
+end
 
 return {
   KeyCode = KeyCode,