Skip to content

Commit ea0e0dc

Browse files
rsjaffersjaffe
committed
Merge branch 'release/2.3.0.1'
2 parents 5a8b71a + d81b7e7 commit ea0e0dc

File tree

837 files changed

+9623
-3103
lines changed

Some content is hidden

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

837 files changed

+9623
-3103
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,3 +341,5 @@ Source/LRPlugin/MIDI2LR.lrplugin/MIDI2LR.app
341341
*.iml
342342

343343
rtmidi/midiprobe
344+
345+
Source/LRPlugin/luacheck\.results

‎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.3.0.0</string>
21+
<string>2.3.0.1</string>
2222
<key>CFBundleVersion</key>
23-
<string>2.3.0.0</string>
23+
<string>2.3.0.1</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
@@ -251,8 +251,8 @@
251251
"DEBUG=1",
252252
"GSL_THROW_ON_CONTRACT_VIOLATION=1",
253253
"JUCER_XCODE_MAC_F6D2F4CF=1",
254-
"JUCE_APP_VERSION=2.3.0.0",
255-
"JUCE_APP_VERSION_HEX=0x2030000",
254+
"JUCE_APP_VERSION=2.3.0.1",
255+
"JUCE_APP_VERSION_HEX=0x2030001",
256256
"JucePlugin_Build_VST=0",
257257
"JucePlugin_Build_VST3=0",
258258
"JucePlugin_Build_AU=0",
@@ -285,8 +285,8 @@
285285
"NDEBUG=1",
286286
"GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1",
287287
"JUCER_XCODE_MAC_F6D2F4CF=1",
288-
"JUCE_APP_VERSION=2.3.0.0",
289-
"JUCE_APP_VERSION_HEX=0x2030000",
288+
"JUCE_APP_VERSION=2.3.0.1",
289+
"JUCE_APP_VERSION_HEX=0x2030001",
290290
"JucePlugin_Build_VST=0",
291291
"JucePlugin_Build_VST3=0",
292292
"JucePlugin_Build_AU=0",

‎Builds/VisualStudio2017/MIDI2LR_App.vcxproj

Lines changed: 13 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;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
77-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;GSL_THROW_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.3.0.0;JUCE_APP_VERSION_HEX=0x2030000;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;GSL_THROW_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.3.0.1;JUCE_APP_VERSION_HEX=0x2030001;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/>
@@ -114,7 +114,7 @@
114114
<ClCompile>
115115
<Optimization>Full</Optimization>
116116
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
117-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.3.0.0;JUCE_APP_VERSION_HEX=0x2030000;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>
117+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;GSL_UNENFORCED_ON_CONTRACT_VIOLATION=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=2.3.0.1;JUCE_APP_VERSION_HEX=0x2030001;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>
118118
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
119119
<RuntimeTypeInfo>true</RuntimeTypeInfo>
120120
<PrecompiledHeader/>
@@ -1301,6 +1301,15 @@
13011301
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_FlexBox.cpp">
13021302
<ExcludedFromBuild>true</ExcludedFromBuild>
13031303
</ClCompile>
1304+
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_Grid.cpp">
1305+
<ExcludedFromBuild>true</ExcludedFromBuild>
1306+
</ClCompile>
1307+
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_GridItem.cpp">
1308+
<ExcludedFromBuild>true</ExcludedFromBuild>
1309+
</ClCompile>
1310+
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
1311+
<ExcludedFromBuild>true</ExcludedFromBuild>
1312+
</ClCompile>
13041313
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
13051314
<ExcludedFromBuild>true</ExcludedFromBuild>
13061315
</ClCompile>
@@ -2063,6 +2072,8 @@
20632072
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_ConcertinaPanel.h"/>
20642073
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_FlexBox.h"/>
20652074
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_FlexItem.h"/>
2075+
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_Grid.h"/>
2076+
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_GridItem.h"/>
20662077
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_GroupComponent.h"/>
20672078
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_MultiDocumentPanel.h"/>
20682079
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_ResizableBorderComponent.h"/>

‎Builds/VisualStudio2017/MIDI2LR_App.vcxproj.filters

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,6 +1558,15 @@
15581558
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_FlexBox.cpp">
15591559
<Filter>Juce Modules\juce_gui_basics\layout</Filter>
15601560
</ClCompile>
1561+
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_Grid.cpp">
1562+
<Filter>Juce Modules\juce_gui_basics\layout</Filter>
1563+
</ClCompile>
1564+
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_GridItem.cpp">
1565+
<Filter>Juce Modules\juce_gui_basics\layout</Filter>
1566+
</ClCompile>
1567+
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_GridUnitTests.cpp">
1568+
<Filter>Juce Modules\juce_gui_basics\layout</Filter>
1569+
</ClCompile>
15611570
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_GroupComponent.cpp">
15621571
<Filter>Juce Modules\juce_gui_basics\layout</Filter>
15631572
</ClCompile>
@@ -3279,6 +3288,12 @@
32793288
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_FlexItem.h">
32803289
<Filter>Juce Modules\juce_gui_basics\layout</Filter>
32813290
</ClInclude>
3291+
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_Grid.h">
3292+
<Filter>Juce Modules\juce_gui_basics\layout</Filter>
3293+
</ClInclude>
3294+
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_GridItem.h">
3295+
<Filter>Juce Modules\juce_gui_basics\layout</Filter>
3296+
</ClInclude>
32823297
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_basics\layout\juce_GroupComponent.h">
32833298
<Filter>Juce Modules\juce_gui_basics\layout</Filter>
32843299
</ClInclude>

‎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,3,0,0
10+
FILEVERSION 2,3,0,1
1111
BEGIN
1212
BLOCK "StringFileInfo"
1313
BEGIN
1414
BLOCK "040904E4"
1515
BEGIN
1616
VALUE "FileDescription", "MIDI2LR\0"
17-
VALUE "FileVersion", "2.3.0.0\0"
17+
VALUE "FileVersion", "2.3.0.1\0"
1818
VALUE "ProductName", "MIDI2LR\0"
19-
VALUE "ProductVersion", "2.3.0.0\0"
19+
VALUE "ProductVersion", "2.3.0.1\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.2.0.0
41+
PROJECT_NUMBER = 2.3.0.0
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.3.0.0</version>
4+
<version>2.3.0.1</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
@@ -36,7 +36,7 @@
3636
namespace ProjectInfo
3737
{
3838
const char* const projectName = "MIDI2LR";
39-
const char* const versionString = "2.3.0.0";
40-
const int versionNumber = 0x2030000;
39+
const char* const versionString = "2.3.0.1";
40+
const int versionNumber = 0x2030001;
4141
}
4242
#endif

‎JuceLibraryCode/modules/juce_audio_basics/audio_play_head/juce_AudioPlayHead.h

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
==============================================================================
2121
*/
2222

23-
#pragma once
24-
23+
namespace juce
24+
{
2525

2626
//==============================================================================
2727
/**
@@ -46,14 +46,15 @@ class JUCE_API AudioPlayHead
4646
/** Frame rate types. */
4747
enum FrameRateType
4848
{
49-
fps24 = 0,
50-
fps25 = 1,
51-
fps2997 = 2,
52-
fps30 = 3,
53-
fps2997drop = 4,
54-
fps30drop = 5,
55-
fps60 = 6,
56-
fps60drop = 7,
49+
fps23976 = 0,
50+
fps24 = 1,
51+
fps25 = 2,
52+
fps2997 = 3,
53+
fps30 = 4,
54+
fps2997drop = 5,
55+
fps30drop = 6,
56+
fps60 = 7,
57+
fps60drop = 8,
5758
fpsUnknown = 99
5859
};
5960

@@ -70,20 +71,20 @@ class JUCE_API AudioPlayHead
7071
/** Time signature denominator, e.g. the 4 of a 3/4 time sig */
7172
int timeSigDenominator;
7273

73-
/** The current play position, in samples from the start of the edit. */
74+
/** The current play position, in samples from the start of the timeline. */
7475
int64 timeInSamples;
75-
/** The current play position, in seconds from the start of the edit. */
76+
/** The current play position, in seconds from the start of the timeline. */
7677
double timeInSeconds;
7778

78-
/** For timecode, the position of the start of the edit, in seconds from 00:00:00:00. */
79+
/** For timecode, the position of the start of the timeline, in seconds from 00:00:00:00. */
7980
double editOriginTime;
8081

8182
/** The current play position, in pulses-per-quarter-note. */
8283
double ppqPosition;
8384

8485
/** The position of the start of the last bar, in pulses-per-quarter-note.
8586
86-
This is the time from the start of the edit to the start of the current
87+
This is the time from the start of the timeline to the start of the current
8788
bar, in ppq units.
8889
8990
Note - this value may be unavailable on some hosts, e.g. Pro-Tools. If
@@ -150,3 +151,5 @@ class JUCE_API AudioPlayHead
150151
/** Rewinds the audio. */
151152
virtual void transportRewind() {}
152153
};
154+
155+
} // namespace juce

‎JuceLibraryCode/modules/juce_audio_basics/buffers/juce_AudioChannelSet.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
==============================================================================
2121
*/
2222

23+
namespace juce
24+
{
25+
2326
AudioChannelSet::AudioChannelSet (uint32 c) : channels (c) {}
2427
AudioChannelSet::AudioChannelSet (const Array<ChannelType>& c)
2528
{
@@ -414,3 +417,5 @@ int32 AudioChannelSet::getWaveChannelMask() const noexcept
414417

415418
return (channels.toInteger() >> 1);
416419
}
420+
421+
} // namespace juce

‎JuceLibraryCode/modules/juce_audio_basics/buffers/juce_AudioChannelSet.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
==============================================================================
2121
*/
2222

23-
#pragma once
24-
23+
namespace juce
24+
{
2525

2626
//==============================================================================
2727
/**
@@ -388,3 +388,5 @@ class JUCE_API AudioChannelSet
388388
explicit AudioChannelSet (uint32);
389389
explicit AudioChannelSet (const Array<ChannelType>&);
390390
};
391+
392+
} // namespace juce

‎JuceLibraryCode/modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
==============================================================================
2121
*/
2222

23+
namespace juce
24+
{
25+
2326
void AudioDataConverters::convertFloatToInt16LE (const float* source, void* dest, int numSamples, const int destBytesPerSample)
2427
{
2528
const double maxVal = (double) 0x7fff;
@@ -309,7 +312,7 @@ void AudioDataConverters::convertInt24BEToFloat (const void* const source, float
309312

310313
void AudioDataConverters::convertInt32LEToFloat (const void* const source, float* const dest, int numSamples, const int srcBytesPerSample)
311314
{
312-
const float scale = 1.0f / 0x7fffffff;
315+
const auto scale = 1.0f / (float) 0x7fffffff;
313316
const char* intData = static_cast<const char*> (source);
314317

315318
if (source != (void*) dest || srcBytesPerSample >= 4)
@@ -334,7 +337,7 @@ void AudioDataConverters::convertInt32LEToFloat (const void* const source, float
334337

335338
void AudioDataConverters::convertInt32BEToFloat (const void* const source, float* const dest, int numSamples, const int srcBytesPerSample)
336339
{
337-
const float scale = 1.0f / 0x7fffffff;
340+
const auto scale = 1.0f / (float) 0x7fffffff;
338341
const char* intData = static_cast<const char*> (source);
339342

340343
if (source != (void*) dest || srcBytesPerSample >= 4)
@@ -596,3 +599,5 @@ class AudioConversionTests : public UnitTest
596599
static AudioConversionTests audioConversionUnitTests;
597600

598601
#endif
602+
603+
} // namespace juce

0 commit comments

Comments
 (0)