Fix tests

Author: kunitoki

modules/yup_audio_basics/midi/ump/yup_UMP.h

@@ -37,12 +37,15 @@
   ==============================================================================
 */
 
+#include "yup_UMPBytesOnGroup.h"
+#include "yup_UMPDeviceInfo.h"
 #include "yup_UMPProtocols.h"
 #include "yup_UMPTypes.h"
 #include "yup_UMPUniversalPacket.h"
 #include "yup_UMPUtils.h"
 #include "yup_UMPacket.h"
 #include "yup_UMPView.h"
+#include "yup_UMPPacketBuffer.h"
 #include "yup_UMPIterator.h"
 #include "yup_UMPackets.h"
 #include "yup_UMPMessages.h"
@@ -65,3 +68,4 @@
 #include "yup_UMPDispatcher.h"
 #include "yup_UMPReceiver.h"
 #include "yup_UMPJitterReductionTimestamps.h"
+#include "yup_UMPKeyboardState.h"

modules/yup_audio_basics/midi/ump/yup_UMPMidi1ToBytestreamTranslator.h

@@ -90,7 +90,7 @@ class Midi1ToBytestreamTranslator
                 if (Utils::getMessageType (firstWord) != 0x00)
                 {
                     const auto message = fromUmp (PacketX1 { firstWord }, time);
-                    callback (message);
+                    dispatchMessage (callback, message);
                 }
 
                 break;
@@ -187,10 +187,29 @@ class Midi1ToBytestreamTranslator
     void terminateSysExMessage (MessageCallback&& callback)
     {
         pendingSysExData.push_back (std::byte { 0xf7 });
-        callback (BytestreamMidiView (pendingSysExData, pendingSysExTime).getMessage());
+        const BytestreamMidiView view (pendingSysExData, pendingSysExTime);
+        dispatchMessage (callback, view);
         pendingSysExData.clear();
     }
 
+    template <typename MessageCallback>
+    static void dispatchMessage (MessageCallback&& callback, const MidiMessage& message)
+    {
+        if constexpr (std::is_invocable_v<MessageCallback, const MidiMessage&>)
+            callback (message);
+        else
+            callback (BytestreamMidiView (&message));
+    }
+
+    template <typename MessageCallback>
+    static void dispatchMessage (MessageCallback&& callback, const BytestreamMidiView& view)
+    {
+        if constexpr (std::is_invocable_v<MessageCallback, const MidiMessage&>)
+            callback (view.getMessage());
+        else
+            callback (view);
+    }
+
     static bool shouldPacketTerminateSysExEarly (uint32_t firstWord)
     {
         return ! (isSysExContinuation (firstWord)

modules/yup_audio_basics/yup_audio_basics.h

@@ -135,6 +135,7 @@
 
 //==============================================================================
 #include <chrono>
+#include <type_traits>
 
 //==============================================================================
 #include "buffers/yup_AudioDataConverters.h"
@@ -167,6 +168,7 @@ YUP_END_IGNORE_WARNINGS_MSVC
 #include "mpe/yup_MPESynthesiserVoice.h"
 #include "mpe/yup_MPESynthesiser.h"
 #include "mpe/yup_MPEUtils.h"
+#include "midi/ump/yup_UMP.h"
 #include "sources/yup_AudioSource.h"
 #include "sources/yup_PositionableAudioSource.h"
 #include "sources/yup_BufferingAudioSource.h"
@@ -180,8 +182,3 @@ YUP_END_IGNORE_WARNINGS_MSVC
 #include "synthesisers/yup_Synthesiser.h"
 #include "audio_play_head/yup_AudioPlayHead.h"
 #include "utilities/yup_AudioWorkgroup.h"
-#include "midi/ump/yup_UMPBytesOnGroup.h"
-#include "midi/ump/yup_UMPDeviceInfo.h"
-#include "midi/ump/yup_UMPPacketBuffer.h"
-#include "midi/ump/yup_UMPKeyboardState.h"
-#include "midi/ump/yup_UMP.h"