Skip to content

Commit 062fd00

Browse files
rsjaffersjaffe
committed
Merge branch 'develop'
2 parents 1f767fc + 7d6b202 commit 062fd00

22 files changed

+92
-91
lines changed

‎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="6.0.0.0"
3+
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="6.0.1.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"

‎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.0.0.0</string>
23+
<string>6.0.1.0</string>
2424
<key>CFBundleVersion</key>
25-
<string>6.0.0.0</string>
25+
<string>6.0.1.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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,8 @@
520520
"JUCE_STANDALONE_APPLICATION=1",
521521
"JUCE_MODAL_LOOPS_PERMITTED=1",
522522
"JUCER_XCODE_MAC_46BB2872=1",
523-
"JUCE_APP_VERSION=6.0.0.0",
524-
"JUCE_APP_VERSION_HEX=0x6000000",
523+
"JUCE_APP_VERSION=6.0.1.0",
524+
"JUCE_APP_VERSION_HEX=0x6000100",
525525
"JucePlugin_Build_VST=0",
526526
"JucePlugin_Build_VST3=0",
527527
"JucePlugin_Build_AU=0",
@@ -642,8 +642,8 @@
642642
"JUCE_STANDALONE_APPLICATION=1",
643643
"JUCE_MODAL_LOOPS_PERMITTED=1",
644644
"JUCER_XCODE_MAC_46BB2872=1",
645-
"JUCE_APP_VERSION=6.0.0.0",
646-
"JUCE_APP_VERSION_HEX=0x6000000",
645+
"JUCE_APP_VERSION=6.0.1.0",
646+
"JUCE_APP_VERSION_HEX=0x6000100",
647647
"JucePlugin_Build_VST=0",
648648
"JucePlugin_Build_VST3=0",
649649
"JucePlugin_Build_AU=0",

‎build/Windows/MIDI2LR_App.vcxproj

Lines changed: 4 additions & 4 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=0x70009;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_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_MODAL_LOOPS_PERMITTED=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;;_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;JUCER_VS2022_A3DCEFC2=1;JUCE_APP_VERSION=6.0.0.0;JUCE_APP_VERSION_HEX=0x6000000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=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=0x70009;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_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_MODAL_LOOPS_PERMITTED=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;;_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;JUCER_VS2022_A3DCEFC2=1;JUCE_APP_VERSION=6.0.1.0;JUCE_APP_VERSION_HEX=0x6000100;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6868
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
6969
<RuntimeTypeInfo>true</RuntimeTypeInfo>
7070
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -78,7 +78,7 @@
7878
</ClCompile>
7979
<ResourceCompile>
8080
<AdditionalIncludeDirectories>..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
81-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x70009;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_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_MODAL_LOOPS_PERMITTED=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;;_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;JUCER_VS2022_A3DCEFC2=1;JUCE_APP_VERSION=6.0.0.0;JUCE_APP_VERSION_HEX=0x6000000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
81+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x70009;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_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_MODAL_LOOPS_PERMITTED=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;;_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;JUCER_VS2022_A3DCEFC2=1;JUCE_APP_VERSION=6.0.1.0;JUCE_APP_VERSION_HEX=0x6000100;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8282
</ResourceCompile>
8383
<Link>
8484
<OutputFile>$(OutDir)\MIDI2LR.exe</OutputFile>
@@ -106,7 +106,7 @@
106106
<ClCompile>
107107
<Optimization>Full</Optimization>
108108
<AdditionalIncludeDirectories>..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
109-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x70009;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_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_MODAL_LOOPS_PERMITTED=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;;_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;JUCER_VS2022_A3DCEFC2=1;JUCE_APP_VERSION=6.0.0.0;JUCE_APP_VERSION_HEX=0x6000000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x70009;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_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_MODAL_LOOPS_PERMITTED=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;;_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;JUCER_VS2022_A3DCEFC2=1;JUCE_APP_VERSION=6.0.1.0;JUCE_APP_VERSION_HEX=0x6000100;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
110110
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
111111
<RuntimeTypeInfo>true</RuntimeTypeInfo>
112112
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -120,7 +120,7 @@
120120
</ClCompile>
121121
<ResourceCompile>
122122
<AdditionalIncludeDirectories>..\..\external\JuceLibraryCode;..\..\external\JuceLibraryCode\modules;../../external/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
123-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x70009;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_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_MODAL_LOOPS_PERMITTED=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;;_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;JUCER_VS2022_A3DCEFC2=1;JUCE_APP_VERSION=6.0.0.0;JUCE_APP_VERSION_HEX=0x6000000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x70009;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_WASAPI=0;JUCE_DIRECTSOUND=0;JUCE_ALSA=0;JUCE_USE_ANDROID_OBOE=0;JUCE_CATCH_UNHANDLED_EXCEPTIONS=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_MODAL_LOOPS_PERMITTED=1;_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;;_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;JUCER_VS2022_A3DCEFC2=1;JUCE_APP_VERSION=6.0.1.0;JUCE_APP_VERSION_HEX=0x6000100;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124124
</ResourceCompile>
125125
<Link>
126126
<OutputFile>$(OutDir)\MIDI2LR.exe</OutputFile>

‎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 6,0,0,0
12+
FILEVERSION 6,0,1,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", "6.0.0.0\0"
21+
VALUE "FileVersion", "6.0.1.0\0"
2222
VALUE "ProductName", "MIDI2LR\0"
23-
VALUE "ProductVersion", "6.0.0.0\0"
23+
VALUE "ProductVersion", "6.0.1.0\0"
2424
END
2525
END
2626

‎docs/CONTRIBUTING.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@ Version number is in the style *major.minor.maintenance.build* and needs to be u
5454

5555
## Notarizing for MacOS
5656

57-
Both the app and the installer need to be notarized for MacOS distribution. Use XCode to notarize and staple application. To notarize and staple installer, run (substitute correct username, password, and MIDI2LR version number)
58-
`xcrun altool --notarize-app --primary-bundle-id "com.rsjaffe.MIDI2LR.installer" --username "InsertUsernameHere" --password "InsertPasswordHere" --file MIDI2LR-W.X.Y.Z-osx-installer.dmg`
59-
60-
After successful notarization, run (substitute correct MIDI2LR version number)
61-
`xcrun stapler staple MIDI2LR-W.X.Y.Z-osx-installer.dmg`
57+
Both the app and the installer need to be notarized for MacOS distribution. Use XCode to notarize and staple application. To notarize and staple installer, follow the [instructions provided by Apple](https://developer.apple.com/documentation/security/notarizing_macos_software_before_distribution/customizing_the_notarization_workflow#3087734).
6258

6359
## Translations
6460

‎external/JuceLibraryCode/JuceHeader.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace ProjectInfo
3838
{
3939
const char* const projectName = "MIDI2LR";
4040
const char* const companyName = "Rory Jaffe";
41-
const char* const versionString = "6.0.0.0";
42-
const int versionNumber = 0x6000000;
41+
const char* const versionString = "6.0.1.0";
42+
const int versionNumber = 0x6000100;
4343
}
4444
#endif

‎src/plugin/ActionSeries.lua

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ActionSeries.lua
44
55
Manages action series for plugin
6-
6+
77
This file is part of MIDI2LR. Copyright 2015 by Rory Jaffe.
88
99
MIDI2LR is free software: you can redistribute it and/or modify it under the
@@ -15,7 +15,7 @@ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1515
PARTICULAR PURPOSE. See the GNU General Public License for more details.
1616
1717
You should have received a copy of the GNU General Public License along with
18-
MIDI2LR. If not, see <http://www.gnu.org/licenses/>.
18+
MIDI2LR. If not, see <http://www.gnu.org/licenses/>.
1919
------------------------------------------------------------------------------]]
2020

2121
local CU = require 'ClientUtilities'
@@ -27,7 +27,7 @@ local LrView = import 'LrView'
2727
Database.ValidActions.Pause = true --this is in addition to the menu list
2828

2929
local function ValidateActions(_,value)
30-
local stack = nil
30+
local stack = nil
3131
for a in value:gmatch("[%w_]+") do
3232
if not Database.ValidActions[a] then
3333
if not stack then
@@ -62,9 +62,8 @@ local function StartDialog(obstable,f)
6262
validate = ValidateActions,
6363
}
6464
}
65-
end
66-
return
67-
f:column(dlgrows)
65+
end
66+
return f:column(dlgrows)
6867
end
6968

7069
local function EndDialog(obstable, status)
@@ -77,16 +76,16 @@ local function EndDialog(obstable, status)
7776
end
7877

7978
local function RunActionSeries(strarg1,actarray)
80-
if strarg1 == nil or strarg1 == '' then
79+
if strarg1 == nil or strarg1 == '' then
8180
MIDI2LR.SERVER:send('Log Empty string in RunActionSeries\n')
82-
return
81+
return
8382
end
8483
local strarg = strarg1 -- make argument available to async task
8584
LrTasks.startAsyncTask(
8685
function()
8786
--[[-----------debug section, enable by adding - to beginning this line
88-
LrMobdebug.on()
89-
--]]-----------end debug section
87+
import 'LrMobdebug'.on()
88+
--]]-----------end debug section
9089
--currently only accepts items in Database assigned 'button' and saved in Database.ValidActions
9190
--will have to parse into command and value if want to go to parameterized commands (e.g., slider change)
9291
for i in strarg:gmatch("[%w_]+") do
@@ -102,7 +101,7 @@ local function RunActionSeries(strarg1,actarray)
102101
end
103102
LrTasks.sleep(0.01) --pause between actions to allow synchronization with slow LR responses and keystrokes from app
104103
end
105-
end
104+
end
106105
)
107106
end
108107

0 commit comments

Comments
 (0)