fix macOS build (following Projucer changes made in Windows, which removed /Applications/JUCE/modules from its headers). move JUCE headers under source control, so that Windows and macOS can both build against same version of JUCE. remove AUv3 target (I think it's an iOS thing, so it will never work with this macOS fluidsynth dylib).
This commit is contained in:
238
modules/juce_audio_basics/mpe/juce_MPEMessages.cpp
Normal file
238
modules/juce_audio_basics/mpe/juce_MPEMessages.cpp
Normal file
@ -0,0 +1,238 @@
|
||||
/*
|
||||
==============================================================================
|
||||
|
||||
This file is part of the JUCE library.
|
||||
Copyright (c) 2017 - ROLI Ltd.
|
||||
|
||||
JUCE is an open source library subject to commercial or open-source
|
||||
licensing.
|
||||
|
||||
The code included in this file is provided under the terms of the ISC license
|
||||
http://www.isc.org/downloads/software-support-policy/isc-license. Permission
|
||||
To use, copy, modify, and/or distribute this software for any purpose with or
|
||||
without fee is hereby granted provided that the above copyright notice and
|
||||
this permission notice appear in all copies.
|
||||
|
||||
JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
|
||||
EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
|
||||
DISCLAIMED.
|
||||
|
||||
==============================================================================
|
||||
*/
|
||||
|
||||
namespace juce
|
||||
{
|
||||
|
||||
MidiBuffer MPEMessages::setLowerZone (int numMemberChannels, int perNotePitchbendRange, int masterPitchbendRange)
|
||||
{
|
||||
auto buffer = MidiRPNGenerator::generate (1, zoneLayoutMessagesRpnNumber, numMemberChannels, false, false);
|
||||
|
||||
buffer.addEvents (setLowerZonePerNotePitchbendRange (perNotePitchbendRange), 0, -1, 0);
|
||||
buffer.addEvents (setLowerZoneMasterPitchbendRange (masterPitchbendRange), 0, -1, 0);
|
||||
|
||||
return buffer;
|
||||
}
|
||||
|
||||
MidiBuffer MPEMessages::setUpperZone (int numMemberChannels, int perNotePitchbendRange, int masterPitchbendRange)
|
||||
{
|
||||
auto buffer = MidiRPNGenerator::generate (16, zoneLayoutMessagesRpnNumber, numMemberChannels, false, false);
|
||||
|
||||
buffer.addEvents (setUpperZonePerNotePitchbendRange (perNotePitchbendRange), 0, -1, 0);
|
||||
buffer.addEvents (setUpperZoneMasterPitchbendRange (masterPitchbendRange), 0, -1, 0);
|
||||
|
||||
return buffer;
|
||||
}
|
||||
|
||||
MidiBuffer MPEMessages::setLowerZonePerNotePitchbendRange (int perNotePitchbendRange)
|
||||
{
|
||||
return MidiRPNGenerator::generate (2, 0, perNotePitchbendRange, false, false);
|
||||
}
|
||||
|
||||
MidiBuffer MPEMessages::setUpperZonePerNotePitchbendRange (int perNotePitchbendRange)
|
||||
{
|
||||
return MidiRPNGenerator::generate (15, 0, perNotePitchbendRange, false, false);
|
||||
}
|
||||
|
||||
MidiBuffer MPEMessages::setLowerZoneMasterPitchbendRange (int masterPitchbendRange)
|
||||
{
|
||||
return MidiRPNGenerator::generate (1, 0, masterPitchbendRange, false, false);
|
||||
}
|
||||
|
||||
MidiBuffer MPEMessages::setUpperZoneMasterPitchbendRange (int masterPitchbendRange)
|
||||
{
|
||||
return MidiRPNGenerator::generate (16, 0, masterPitchbendRange, false, false);
|
||||
}
|
||||
|
||||
MidiBuffer MPEMessages::clearLowerZone()
|
||||
{
|
||||
return MidiRPNGenerator::generate (1, zoneLayoutMessagesRpnNumber, 0, false, false);
|
||||
}
|
||||
|
||||
MidiBuffer MPEMessages::clearUpperZone()
|
||||
{
|
||||
return MidiRPNGenerator::generate (16, zoneLayoutMessagesRpnNumber, 0, false, false);
|
||||
}
|
||||
|
||||
MidiBuffer MPEMessages::clearAllZones()
|
||||
{
|
||||
MidiBuffer buffer;
|
||||
|
||||
buffer.addEvents (clearLowerZone(), 0, -1, 0);
|
||||
buffer.addEvents (clearUpperZone(), 0, -1, 0);
|
||||
|
||||
return buffer;
|
||||
}
|
||||
|
||||
MidiBuffer MPEMessages::setZoneLayout (MPEZoneLayout layout)
|
||||
{
|
||||
MidiBuffer buffer;
|
||||
|
||||
buffer.addEvents (clearAllZones(), 0, -1, 0);
|
||||
|
||||
auto lowerZone = layout.getLowerZone();
|
||||
if (lowerZone.isActive())
|
||||
buffer.addEvents (setLowerZone (lowerZone.numMemberChannels,
|
||||
lowerZone.perNotePitchbendRange,
|
||||
lowerZone.masterPitchbendRange),
|
||||
0, -1, 0);
|
||||
|
||||
auto upperZone = layout.getUpperZone();
|
||||
if (upperZone.isActive())
|
||||
buffer.addEvents (setUpperZone (upperZone.numMemberChannels,
|
||||
upperZone.perNotePitchbendRange,
|
||||
upperZone.masterPitchbendRange),
|
||||
0, -1, 0);
|
||||
|
||||
return buffer;
|
||||
}
|
||||
|
||||
//==============================================================================
|
||||
//==============================================================================
|
||||
#if JUCE_UNIT_TESTS
|
||||
|
||||
class MPEMessagesTests : public UnitTest
|
||||
{
|
||||
public:
|
||||
MPEMessagesTests() : UnitTest ("MPEMessages class", "MIDI/MPE") {}
|
||||
|
||||
void runTest() override
|
||||
{
|
||||
beginTest ("add zone");
|
||||
{
|
||||
{
|
||||
MidiBuffer buffer = MPEMessages::setLowerZone (7);
|
||||
|
||||
const uint8 expectedBytes[] =
|
||||
{
|
||||
0xb0, 0x64, 0x06, 0xb0, 0x65, 0x00, 0xb0, 0x06, 0x07, // set up zone
|
||||
0xb1, 0x64, 0x00, 0xb1, 0x65, 0x00, 0xb1, 0x06, 0x30, // per-note pbrange (default = 48)
|
||||
0xb0, 0x64, 0x00, 0xb0, 0x65, 0x00, 0xb0, 0x06, 0x02 // master pbrange (default = 2)
|
||||
};
|
||||
|
||||
testMidiBuffer (buffer, expectedBytes, sizeof (expectedBytes));
|
||||
}
|
||||
{
|
||||
MidiBuffer buffer = MPEMessages::setUpperZone (5, 96, 0);
|
||||
|
||||
const uint8 expectedBytes[] =
|
||||
{
|
||||
0xbf, 0x64, 0x06, 0xbf, 0x65, 0x00, 0xbf, 0x06, 0x05, // set up zone
|
||||
0xbe, 0x64, 0x00, 0xbe, 0x65, 0x00, 0xbe, 0x06, 0x60, // per-note pbrange (custom)
|
||||
0xbf, 0x64, 0x00, 0xbf, 0x65, 0x00, 0xbf, 0x06, 0x00 // master pbrange (custom)
|
||||
};
|
||||
|
||||
testMidiBuffer (buffer, expectedBytes, sizeof (expectedBytes));
|
||||
}
|
||||
}
|
||||
|
||||
beginTest ("set per-note pitchbend range");
|
||||
{
|
||||
MidiBuffer buffer = MPEMessages::setLowerZonePerNotePitchbendRange (96);
|
||||
|
||||
const uint8 expectedBytes[] = { 0xb1, 0x64, 0x00, 0xb1, 0x65, 0x00, 0xb1, 0x06, 0x60 };
|
||||
|
||||
testMidiBuffer (buffer, expectedBytes, sizeof (expectedBytes));
|
||||
}
|
||||
|
||||
|
||||
beginTest ("set master pitchbend range");
|
||||
{
|
||||
MidiBuffer buffer = MPEMessages::setUpperZoneMasterPitchbendRange (60);
|
||||
|
||||
const uint8 expectedBytes[] = { 0xbf, 0x64, 0x00, 0xbf, 0x65, 0x00, 0xbf, 0x06, 0x3c };
|
||||
|
||||
testMidiBuffer (buffer, expectedBytes, sizeof (expectedBytes));
|
||||
}
|
||||
|
||||
beginTest ("clear all zones");
|
||||
{
|
||||
MidiBuffer buffer = MPEMessages::clearAllZones();
|
||||
|
||||
const uint8 expectedBytes[] = { 0xb0, 0x64, 0x06, 0xb0, 0x65, 0x00, 0xb0, 0x06, 0x00, // clear lower zone
|
||||
0xbf, 0x64, 0x06, 0xbf, 0x65, 0x00, 0xbf, 0x06, 0x00 // clear upper zone
|
||||
};
|
||||
|
||||
testMidiBuffer (buffer, expectedBytes, sizeof (expectedBytes));
|
||||
}
|
||||
|
||||
beginTest ("set complete state");
|
||||
{
|
||||
MPEZoneLayout layout;
|
||||
|
||||
layout.setLowerZone (7, 96, 0);
|
||||
layout.setUpperZone (7);
|
||||
|
||||
MidiBuffer buffer = MPEMessages::setZoneLayout (layout);
|
||||
|
||||
const uint8 expectedBytes[] = {
|
||||
0xb0, 0x64, 0x06, 0xb0, 0x65, 0x00, 0xb0, 0x06, 0x00, // clear lower zone
|
||||
0xbf, 0x64, 0x06, 0xbf, 0x65, 0x00, 0xbf, 0x06, 0x00, // clear upper zone
|
||||
0xb0, 0x64, 0x06, 0xb0, 0x65, 0x00, 0xb0, 0x06, 0x07, // set lower zone
|
||||
0xb1, 0x64, 0x00, 0xb1, 0x65, 0x00, 0xb1, 0x06, 0x60, // per-note pbrange (custom)
|
||||
0xb0, 0x64, 0x00, 0xb0, 0x65, 0x00, 0xb0, 0x06, 0x00, // master pbrange (custom)
|
||||
0xbf, 0x64, 0x06, 0xbf, 0x65, 0x00, 0xbf, 0x06, 0x07, // set upper zone
|
||||
0xbe, 0x64, 0x00, 0xbe, 0x65, 0x00, 0xbe, 0x06, 0x30, // per-note pbrange (default = 48)
|
||||
0xbf, 0x64, 0x00, 0xbf, 0x65, 0x00, 0xbf, 0x06, 0x02 // master pbrange (default = 2)
|
||||
};
|
||||
|
||||
testMidiBuffer (buffer, expectedBytes, sizeof (expectedBytes));
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
//==============================================================================
|
||||
void testMidiBuffer (MidiBuffer& buffer, const uint8* expectedBytes, int expectedBytesSize)
|
||||
{
|
||||
uint8 actualBytes[128] = { 0 };
|
||||
extractRawBinaryData (buffer, actualBytes, sizeof (actualBytes));
|
||||
|
||||
expectEquals (std::memcmp (actualBytes, expectedBytes, (std::size_t) expectedBytesSize), 0);
|
||||
}
|
||||
|
||||
//==============================================================================
|
||||
void extractRawBinaryData (const MidiBuffer& midiBuffer, const uint8* bufferToCopyTo, std::size_t maxBytes)
|
||||
{
|
||||
std::size_t pos = 0;
|
||||
MidiBuffer::Iterator iter (midiBuffer);
|
||||
MidiMessage midiMessage;
|
||||
int samplePosition; // Note: not actually used, so no need to initialise.
|
||||
|
||||
while (iter.getNextEvent (midiMessage, samplePosition))
|
||||
{
|
||||
const uint8* data = midiMessage.getRawData();
|
||||
std::size_t dataSize = (std::size_t) midiMessage.getRawDataSize();
|
||||
|
||||
if (pos + dataSize > maxBytes)
|
||||
return;
|
||||
|
||||
std::memcpy ((void*) (bufferToCopyTo + pos), data, dataSize);
|
||||
pos += dataSize;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static MPEMessagesTests MPEMessagesUnitTests;
|
||||
|
||||
#endif // JUCE_UNIT_TESTS
|
||||
|
||||
} // namespace juce
|
Reference in New Issue
Block a user