mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-09 23:34:20 +00:00
Code Activity

MIDI: Update UMPDispatcher to allow dispatching on a specific group

Browse source
This commit is contained in:
reuk 2025-03-06 17:40:43 +00:00
parent fa1f8ed54e
commit 7dc906fa1b
No known key found for this signature in database
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/juce_audio_basics/midi/ump/juce_UMPDispatcher.h
View file

@ -92,9 +92,10 @@ public:
Channel messages will be converted to the requested protocol format `pp`. Channel messages will be converted to the requested protocol format `pp`.
`storageSize` bytes will be allocated to store incomplete messages. `storageSize` bytes will be allocated to store incomplete messages.
*/ */
explicit BytestreamToUMPDispatcher (PacketProtocol pp, int storageSize) BytestreamToUMPDispatcher (uint8_t targetGroup, PacketProtocol pp, int storageSize)
: concatenator (storageSize), : concatenator (storageSize),
converter (pp) converter (pp),
group (targetGroup)
{} {}
void reset() void reset()
@ -123,13 +124,16 @@ public:
void handleIncomingMidiMessage (void*, const MidiMessage& msg) const void handleIncomingMidiMessage (void*, const MidiMessage& msg) const
{ {
Conversion::toMidi1 ({ 0, msg.asSpan() }, [&] (const View& view) Conversion::toMidi1 ({ dispatch.group, msg.asSpan() }, [&] (const View& view)
{ {
dispatch.converter.convert (view, *callbackPtr); dispatch.converter.convert (view, [&] (const View& v)
{
(*callbackPtr) (v, msg.getTimeStamp());
});
}); });
} }
void handlePartialSysexMessage (void*, const uint8_t*, int, double) const {} void handlePartialSysexMessage (void*, const uint8*, int, double) const {}
BytestreamToUMPDispatcher& dispatch; BytestreamToUMPDispatcher& dispatch;
CallbackPtr callbackPtr = nullptr; CallbackPtr callbackPtr = nullptr;
@ -139,9 +143,15 @@ public:
concatenator.pushMidiData (bytes, timestamp, (void*) nullptr, inputCallback); concatenator.pushMidiData (bytes, timestamp, (void*) nullptr, inputCallback);
} }
PacketProtocol getProtocol() const
{
return converter.getProtocol();
}
private: private:
MidiDataConcatenator concatenator; MidiDataConcatenator concatenator;
GenericUMPConverter converter; GenericUMPConverter converter;
uint8_t group{};
}; };
//============================================================================== //==============================================================================

6
modules/juce_audio_devices/midi_io/ump/juce_UMPBytestreamInputHandler.h
View file

@ -107,7 +107,7 @@ struct BytestreamToBytestreamHandler : public BytestreamInputHandler
struct BytestreamToUMPHandler : public BytestreamInputHandler struct BytestreamToUMPHandler : public BytestreamInputHandler
{ {
BytestreamToUMPHandler (PacketProtocol protocol, Receiver& c) BytestreamToUMPHandler (PacketProtocol protocol, Receiver& c)
: recipient (c), dispatcher (protocol, 2048) {} : recipient (c), dispatcher (0, protocol, 2048) {}
/** /**
Provides an `operator()` which can create an input handler for a given Provides an `operator()` which can create an input handler for a given
@ -137,9 +137,9 @@ struct BytestreamToUMPHandler : public BytestreamInputHandler
void pushMidiData (const void* data, int bytes, double time) override void pushMidiData (const void* data, int bytes, double time) override
{ {
const auto* ptr = static_cast<const std::byte*> (data); const auto* ptr = static_cast<const std::byte*> (data);
dispatcher.dispatch (Span { ptr, (size_t) bytes }, time, [&] (const View& v) dispatcher.dispatch (Span { ptr, (size_t) bytes }, time, [&] (const View& v, double t)
{ {
recipient.packetReceived (v, time); recipient.packetReceived (v, t);
}); });
} }