Skip to content

Commit 6cbcb63

Browse files
rsjaffersjaffe
committed
Merge branch 'develop'
2 parents 0ccb989 + 43c5530 commit 6cbcb63

File tree

10 files changed

+18
-18
lines changed

10 files changed

+18
-18
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.7.0.3</string>
21+
<string>2.7.0.4</string>
2222
<key>CFBundleVersion</key>
23-
<string>2.7.0.3</string>
23+
<string>2.7.0.4</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
@@ -290,8 +290,8 @@
290290
"U_STATIC_IMPLEMENTATION=1",
291291
"GSL_THROW_ON_CONTRACT_VIOLATION=1",
292292
"JUCER_XCODE_MAC_F6D2F4CF=1",
293-
"JUCE_APP_VERSION=2.7.0.3",
294-
"JUCE_APP_VERSION_HEX=0x2070003",
293+
"JUCE_APP_VERSION=2.7.0.4",
294+
"JUCE_APP_VERSION_HEX=0x2070004",
295295
"JucePlugin_Build_VST=0",
296296
"JucePlugin_Build_VST3=0",
297297
"JucePlugin_Build_AU=0",
@@ -325,8 +325,8 @@
325325
"U_STATIC_IMPLEMENTATION=1",
326326
"GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1",
327327
"JUCER_XCODE_MAC_F6D2F4CF=1",
328-
"JUCE_APP_VERSION=2.7.0.3",
329-
"JUCE_APP_VERSION_HEX=0x2070003",
328+
"JUCE_APP_VERSION=2.7.0.4",
329+
"JUCE_APP_VERSION_HEX=0x2070004",
330330
"JucePlugin_Build_VST=0",
331331
"JucePlugin_Build_VST3=0",
332332
"JucePlugin_Build_AU=0",

‎Builds/VisualStudio2017/MIDI2LR_App.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<Optimization>Disabled</Optimization>
7575
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
7676
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
77-
<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.7.0.3;JUCE_APP_VERSION_HEX=0x2070003;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>
77+
<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.7.0.4;JUCE_APP_VERSION_HEX=0x2070004;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>
7878
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
7979
<RuntimeTypeInfo>true</RuntimeTypeInfo>
8080
<PrecompiledHeader/>
@@ -115,7 +115,7 @@
115115
<ClCompile>
116116
<Optimization>Full</Optimization>
117117
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../;../../icu/source/common/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
118-
<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.7.0.3;JUCE_APP_VERSION_HEX=0x2070003;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>
118+
<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.7.0.4;JUCE_APP_VERSION_HEX=0x2070004;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>
119119
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
120120
<RuntimeTypeInfo>true</RuntimeTypeInfo>
121121
<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,7,0,3
10+
FILEVERSION 2,7,0,4
1111
BEGIN
1212
BLOCK "StringFileInfo"
1313
BEGIN
1414
BLOCK "040904E4"
1515
BEGIN
1616
VALUE "FileDescription", "MIDI2LR\0"
17-
VALUE "FileVersion", "2.7.0.3\0"
17+
VALUE "FileVersion", "2.7.0.4\0"
1818
VALUE "ProductName", "MIDI2LR\0"
19-
VALUE "ProductVersion", "2.7.0.3\0"
19+
VALUE "ProductVersion", "2.7.0.4\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.7.0.3
41+
PROJECT_NUMBER = 2.7.0.4
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.7.0.3</version>
4+
<version>2.7.0.4</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.7.0.3";
38-
const int versionNumber = 0x2070003;
37+
const char* const versionString = "2.7.0.4";
38+
const int versionNumber = 0x2070004;
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.7.0.3"
3+
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="2.7.0.4"
44
bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
55
jucerVersion="5.2.0" companyWebsite="http://rsjaffe.github.io/MIDI2LR/"
66
companyEmail="rsjaffe@gmail.com" displaySplashScreen="0" reportAppUsage="0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,5 @@ return {
6666
},
6767

6868
},
69-
VERSION = { major=2, minor=7, revision=0, build=3}
69+
VERSION = { major=2, minor=7, revision=0, build=4}
7070
}

‎Source/LR_IPC_In.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ namespace {
158158
{
159159
value.remove_prefix(std::min(value.find_first_not_of(" \t\n"), value.size()));
160160
if (const auto tr = value.find_last_not_of(" \t\n"); tr != value.npos)
161-
value.remove_suffix(value.size() - tr);
161+
value.remove_suffix(value.size() - tr - 1);
162162
}
163163
};
164164

0 commit comments

Comments
 (0)