UMP: Remove juce_audio_devices dependency

modules/juce_audio_basics/juce_audio_basics.cpp

@@ -87,6 +87,13 @@
 #include "sources/juce_ToneGeneratorAudioSource.cpp"
 #include "synthesisers/juce_Synthesiser.cpp"
 
+#include "midi/ump/juce_UMP.h"
+#include "midi/ump/juce_UMPUtils.cpp"
+#include "midi/ump/juce_UMPView.cpp"
+#include "midi/ump/juce_UMPSysEx7.cpp"
+#include "midi/ump/juce_UMPMidi1ToMidi2DefaultTranslator.cpp"
+
 #if JUCE_UNIT_TESTS
  #include "utilities/juce_ADSR_test.cpp"
+ #include "midi/ump/juce_UMPTests.cpp"
 #endif

modules/juce_audio_basics/midi/ump/juce_UMP.h

@@ -0,0 +1,43 @@
+/*
+  ==============================================================================
+
+   This file is part of the JUCE library.
+   Copyright (c) 2020 - Raw Material Software Limited
+
+   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.
+
+  ==============================================================================
+*/
+
+#include "../juce_MidiDataConcatenator.h"
+
+#include "juce_UMPProtocols.h"
+#include "juce_UMPUtils.h"
+#include "juce_UMPacket.h"
+#include "juce_UMPSysEx7.h"
+#include "juce_UMPView.h"
+#include "juce_UMPIterator.h"
+#include "juce_UMPackets.h"
+#include "juce_UMPFactory.h"
+#include "juce_UMPConversion.h"
+#include "juce_UMPMidi1ToBytestreamTranslator.h"
+#include "juce_UMPMidi1ToMidi2DefaultTranslator.h"
+#include "juce_UMPConverters.h"
+#include "juce_UMPDispatcher.h"
+#include "juce_UMPReceiver.h"
+
+namespace juce
+{
+namespace ump = universal_midi_packets;
+}

modules/juce_audio_devices/juce_audio_devices.cpp

@@ -45,38 +45,13 @@
 
 #include "juce_audio_devices.h"
 
-#include "native/juce_MidiDataConcatenator.h"
-
-#include "midi_io/ump/juce_UMPProtocols.h"
-#include "midi_io/ump/juce_UMPUtils.h"
-#include "midi_io/ump/juce_UMPacket.h"
-#include "midi_io/ump/juce_UMPSysEx7.h"
-#include "midi_io/ump/juce_UMPView.h"
-#include "midi_io/ump/juce_UMPIterator.h"
-#include "midi_io/ump/juce_UMPackets.h"
-#include "midi_io/ump/juce_UMPFactory.h"
-#include "midi_io/ump/juce_UMPConversion.h"
-#include "midi_io/ump/juce_UMPMidi1ToBytestreamTranslator.h"
-#include "midi_io/ump/juce_UMPMidi1ToMidi2DefaultTranslator.h"
-#include "midi_io/ump/juce_UMPConverters.h"
-#include "midi_io/ump/juce_UMPDispatcher.h"
-#include "midi_io/ump/juce_UMPReceiver.h"
-#include "midi_io/ump/juce_UMPBytestreamInputHandler.h"
-#include "midi_io/ump/juce_UMPU32InputHandler.h"
-
-#include "midi_io/ump/juce_UMPUtils.cpp"
-#include "midi_io/ump/juce_UMPView.cpp"
-#include "midi_io/ump/juce_UMPSysEx7.cpp"
-#include "midi_io/ump/juce_UMPMidi1ToMidi2DefaultTranslator.cpp"
-
-#include "midi_io/ump/juce_UMPTests.cpp"
-
-namespace juce
-{
-namespace ump = universal_midi_packets;
-}
-
 //==============================================================================
+#if JUCE_MAC || JUCE_IOS
+ #include <juce_audio_basics/midi/ump/juce_UMP.h>
+ #include "midi_io/ump/juce_UMPBytestreamInputHandler.h"
+ #include "midi_io/ump/juce_UMPU32InputHandler.h"
+#endif
+
 #if JUCE_MAC
  #define Point CarbonDummyPointName
  #define Component CarbonDummyCompName
@@ -135,6 +110,7 @@ namespace ump = universal_midi_packets;
   JUCE_END_IGNORE_WARNINGS_MSVC
  #endif
 
+ #include <juce_audio_basics/midi/juce_MidiDataConcatenator.h>
  #include "native/juce_win32_Midi.cpp"
 
  #if JUCE_ASIO
@@ -196,12 +172,14 @@ namespace ump = universal_midi_packets;
   */
   #include <Bela.h>
   #include <Midi.h>
+  #include <juce_audio_basics/midi/juce_MidiDataConcatenator.h>
   #include "native/juce_linux_Bela.cpp"
  #endif
 
  #undef SIZEOF
 
  #if ! JUCE_BELA
+  #include <juce_audio_basics/midi/juce_MidiDataConcatenator.h>
   #include "native/juce_linux_Midi.cpp"
  #endif
 
@@ -209,6 +187,8 @@ namespace ump = universal_midi_packets;
 #elif JUCE_ANDROID
 
  #include "native/juce_android_Audio.cpp"
+
+ #include <juce_audio_basics/midi/juce_MidiDataConcatenator.h>
  #include "native/juce_android_Midi.cpp"
 
  #if JUCE_USE_ANDROID_OPENSLES || JUCE_USE_ANDROID_OBOE

modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm

@@ -53,7 +53,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations")
 #endif
 
 #include <juce_audio_basics/native/juce_mac_CoreAudioLayouts.h>
-#include <juce_audio_devices/native/juce_MidiDataConcatenator.h>
+#include <juce_audio_basics/midi/juce_MidiDataConcatenator.h>
 #include "juce_AU_Shared.h"
 
 namespace juce