Here’s a patch to support the Oboe AudioIODeviceType::Listener notification:
diff --git a/modules/juce_audio_devices/native/java/app/com/rmsl/juce/JuceAudioDevicesListener.java b/modules/juce_audio_devices/native/java/app/com/rmsl/juce/JuceAudioDevicesListener.java
new file mode 100644
index 0000000000..651f0a8490
--- /dev/null
+++ b/modules/juce_audio_devices/native/java/app/com/rmsl/juce/JuceAudioDevicesListener.java
@@ -0,0 +1,52 @@
+package com.rmsl.juce;
+
+import android.content.Context;
+
+import android.media.AudioManager;
+import android.media.AudioDeviceInfo;
+import android.media.AudioDeviceCallback;
+
+
+public final class JuceAudioDevicesListener extends AudioDeviceCallback
+{
+ // first callback is triggered by registration
+ boolean triggerCallback = false;
+ long audioDeviceType = 0;
+
+ private native void handleDevicesChanged (long adt);
+
+ @Override
+ public void onAudioDevicesAdded (AudioDeviceInfo[] addedDevices)
+ {
+ if (triggerCallback)
+ {
+ if (0 != audioDeviceType)
+ {
+ handleDevicesChanged (audioDeviceType);
+ }
+ }
+ else
+ {
+ triggerCallback = true;
+ }
+ }
+
+ @Override
+ public void onAudioDevicesRemoved (AudioDeviceInfo[] removedDevices)
+ {
+ if (0 != audioDeviceType)
+ {
+ handleDevicesChanged (audioDeviceType);
+ }
+ }
+
+ public JuceAudioDevicesListener (Context context, long delegate)
+ {
+ audioDeviceType = delegate;
+
+ AudioManager audioManager = (AudioManager) context.getSystemService (
+ Context.AUDIO_SERVICE);
+
+ audioManager.registerAudioDeviceCallback (this, null);
+ }
+}
\ No newline at end of file
diff --git a/modules/juce_audio_devices/native/juce_Oboe_android.cpp b/modules/juce_audio_devices/native/juce_Oboe_android.cpp
index 0ee468f287..7ec728077e 100644
--- a/modules/juce_audio_devices/native/juce_Oboe_android.cpp
+++ b/modules/juce_audio_devices/native/juce_Oboe_android.cpp
@@ -45,6 +45,85 @@
namespace juce
{
+const uint8 javaJuceAudioDevicesListener []
+{
+ 0x1f, 0x8b, 0x08, 0x08, 0x39, 0x62, 0x45, 0x69, 0x00, 0x03, 0x63, 0x6c,
+ 0x61, 0x73, 0x73, 0x65, 0x73, 0x2e, 0x64, 0x65, 0x78, 0x00, 0x75, 0x54,
+ 0x5d, 0x6f, 0x1b, 0x45, 0x14, 0xbd, 0x33, 0xbb, 0x9b, 0xa4, 0x1f, 0x38,
+ 0xa9, 0x9b, 0x84, 0x86, 0x16, 0x61, 0x6d, 0x25, 0x44, 0xa5, 0xd8, 0x6b,
+ 0xa7, 0x29, 0xb6, 0x63, 0x84, 0x88, 0x52, 0x24, 0xb0, 0xb6, 0x02, 0x91,
+ 0x92, 0x87, 0x52, 0x45, 0x1d, 0xef, 0x4e, 0x9c, 0x4d, 0xd7, 0xbb, 0xee,
+ 0xae, 0x63, 0xb9, 0x42, 0x54, 0x6d, 0x9f, 0x22, 0x24, 0x24, 0x90, 0xf8,
+ 0xa8, 0x78, 0xa0, 0x82, 0x07, 0x84, 0x80, 0x1f, 0xd0, 0x87, 0x3e, 0xf0,
+ 0xd0, 0xb7, 0xfe, 0x85, 0x22, 0xfe, 0x41, 0x9f, 0xf8, 0x01, 0x3d, 0xb3,
+ 0x3b, 0x49, 0x5c, 0xa9, 0xb1, 0x7c, 0xf6, 0xdc, 0xb9, 0x77, 0xee, 0xcc,
+ 0xb9, 0xd7, 0xeb, 0xeb, 0xcb, 0xd1, 0xf1, 0xea, 0xc5, 0x26, 0x15, 0x27,
+ 0x9d, 0xe2, 0xbd, 0xfa, 0xe6, 0x1f, 0x17, 0xe6, 0xc5, 0xf7, 0x9b, 0xb7,
+ 0xfe, 0xfd, 0x3d, 0xf9, 0xab, 0xb2, 0xfa, 0x53, 0xd8, 0xf8, 0xf3, 0xb1,
+ 0x45, 0xd4, 0x27, 0xa2, 0xd1, 0xc6, 0x72, 0x91, 0xf4, 0xe7, 0x1c, 0x7c,
+ 0x67, 0x29, 0xf7, 0x9f, 0x00, 0x9e, 0x01, 0x13, 0xc0, 0x14, 0x23, 0xe2,
+ 0xe0, 0x4f, 0xc1, 0x93, 0xe0, 0x1b, 0x60, 0x7c, 0xe9, 0x01, 0x1e, 0xa6,
+ 0x49, 0xf4, 0x08, 0xfc, 0x23, 0x36, 0xfc, 0x02, 0xfc, 0x0a, 0xfc, 0x03,
+ 0x3c, 0x01, 0xfe, 0x03, 0x4c, 0x83, 0xc8, 0x06, 0x1a, 0x40, 0x07, 0x18,
+ 0x02, 0x5f, 0x03, 0xdf, 0x00, 0xdf, 0x01, 0x3f, 0x00, 0x3f, 0x03, 0x0f,
+ 0x81, 0xdf, 0x80, 0x27, 0xc0, 0x53, 0xe0, 0x19, 0xf0, 0xdc, 0xc8, 0xcf,
+ 0x5f, 0x00, 0xaa, 0xc0, 0x15, 0x60, 0xd3, 0xcc, 0xef, 0x06, 0x91, 0xa5,
+ 0xf5, 0x29, 0x4d, 0x53, 0xc0, 0x31, 0xe0, 0xb8, 0xd6, 0x3e, 0x03, 0x9c,
+ 0x02, 0x0c, 0xbd, 0xa7, 0xcf, 0x73, 0xff, 0x94, 0xae, 0xf5, 0xa4, 0xb6,
+ 0x47, 0xf0, 0x17, 0xb4, 0x7d, 0x17, 0xf6, 0xb4, 0xb6, 0xf7, 0x60, 0xbf,
+ 0xa6, 0xed, 0x6f, 0x79, 0x7e, 0xd7, 0xe9, 0xec, 0xce, 0x63, 0xb4, 0x40,
+ 0xb9, 0x86, 0x59, 0x52, 0x7d, 0x61, 0xd9, 0x79, 0x06, 0x14, 0x9d, 0xc9,
+ 0xe2, 0x46, 0xb6, 0xb6, 0x10, 0x99, 0xcb, 0xd8, 0xa2, 0x79, 0xcd, 0xaf,
+ 0x6b, 0xcd, 0xa7, 0x28, 0xef, 0x27, 0x8d, 0x71, 0x16, 0xc8, 0xc8, 0xcc,
+ 0x4e, 0xb8, 0x8a, 0x80, 0xca, 0xef, 0xcf, 0x30, 0xdc, 0x50, 0xa4, 0xeb,
+ 0xe0, 0x6b, 0x10, 0xf0, 0x86, 0x51, 0xa4, 0xa8, 0x44, 0xb4, 0x44, 0x27,
+ 0xf9, 0x5b, 0xdc, 0xa0, 0xa2, 0x11, 0x55, 0x39, 0x9e, 0x85, 0xac, 0x4e,
+ 0x9e, 0xe5, 0x76, 0x78, 0xae, 0xed, 0xf3, 0x0f, 0x19, 0x35, 0xac, 0x02,
+ 0xad, 0x7f, 0x40, 0x34, 0x0f, 0x5f, 0xcd, 0xe2, 0x58, 0x5b, 0xd4, 0x47,
+ 0x33, 0x4d, 0x56, 0xa0, 0xe2, 0xdc, 0x75, 0xec, 0x28, 0x1c, 0xe4, 0xed,
+ 0xf0, 0xbc, 0x2f, 0x47, 0xed, 0x2f, 0xab, 0x5e, 0x71, 0xd1, 0xe6, 0xa5,
+ 0xc5, 0xca, 0x03, 0x9a, 0x47, 0xaa, 0xbb, 0xb7, 0x49, 0x6f, 0x83, 0xf7,
+ 0xb2, 0x2e, 0x4c, 0xea, 0xbe, 0xec, 0xd7, 0xc5, 0x34, 0x73, 0xd4, 0xc4,
+ 0xb2, 0xdf, 0x66, 0xe2, 0xbd, 0x20, 0x0a, 0x06, 0xef, 0x13, 0x6b, 0xd3,
+ 0x9b, 0xed, 0x5d, 0x4f, 0xae, 0xee, 0xfa, 0x41, 0x7c, 0x59, 0x0e, 0x03,
+ 0x4f, 0xa6, 0x6e, 0x90, 0x0e, 0x64, 0x24, 0x93, 0xca, 0x8e, 0x18, 0x0a,
+ 0xe2, 0xae, 0x4b, 0x0b, 0xae, 0x88, 0xfc, 0x24, 0x0e, 0x7c, 0xc7, 0x8b,
+ 0x23, 0xc4, 0x06, 0xce, 0x9a, 0xe2, 0xd1, 0xa0, 0x45, 0xe7, 0x0f, 0x42,
+ 0x3d, 0xe9, 0x07, 0xc2, 0x19, 0x3b, 0x68, 0x4d, 0x84, 0x61, 0x47, 0x78,
+ 0x37, 0x5b, 0x74, 0xee, 0x55, 0x9b, 0xae, 0x88, 0x48, 0x74, 0x65, 0xd2,
+ 0xa2, 0xd9, 0x83, 0x68, 0x9c, 0x3a, 0x1f, 0xc1, 0x0e, 0x95, 0xf7, 0x1d,
+ 0xd7, 0x8b, 0x7b, 0x4e, 0xd2, 0x4b, 0x43, 0x67, 0x07, 0x02, 0x9d, 0xa3,
+ 0x54, 0xb6, 0xa8, 0xe8, 0x2a, 0xa1, 0x4e, 0x28, 0xa2, 0xae, 0xf3, 0x49,
+ 0x67, 0x47, 0x7a, 0x83, 0x97, 0x7d, 0xeb, 0x83, 0x24, 0x88, 0xba, 0x2d,
+ 0x62, 0x1b, 0xc4, 0x37, 0xda, 0x80, 0x4b, 0xc6, 0x86, 0xdb, 0x56, 0x0f,
+ 0x97, 0xd8, 0x35, 0x2a, 0x7d, 0x71, 0x74, 0x0d, 0x1f, 0x47, 0x5b, 0x71,
+ 0x8b, 0x2c, 0xa1, 0x3c, 0x34, 0x2d, 0x0e, 0x03, 0x57, 0x6f, 0xf7, 0x25,
+ 0xcd, 0x74, 0xe5, 0x60, 0xfd, 0x36, 0x74, 0xf4, 0xd6, 0x65, 0xa2, 0xbc,
+ 0x34, 0xbb, 0x9d, 0xe9, 0xd7, 0x1a, 0xd7, 0xb0, 0xea, 0x4a, 0x9f, 0x4e,
+ 0xc7, 0xd1, 0xb8, 0xf4, 0x55, 0xdf, 0x87, 0x73, 0xee, 0x65, 0xe7, 0x67,
+ 0xb2, 0x17, 0x0f, 0xe1, 0x3e, 0x9b, 0xc8, 0xae, 0x2a, 0x2d, 0x79, 0x45,
+ 0x27, 0x69, 0x1a, 0xa5, 0x74, 0xd1, 0xb4, 0x03, 0xc7, 0x43, 0x76, 0xe7,
+ 0xce, 0xe5, 0xc6, 0x97, 0xb6, 0x5a, 0xc8, 0xc8, 0xb7, 0x57, 0x6c, 0x5f,
+ 0x8e, 0xec, 0x45, 0x1b, 0xbd, 0xeb, 0x07, 0xa1, 0x18, 0x04, 0x71, 0x54,
+ 0xee, 0xc5, 0xbe, 0x44, 0x20, 0x91, 0xa1, 0x14, 0xa9, 0x44, 0x70, 0x5b,
+ 0xa4, 0x65, 0x6f, 0x5b, 0x7a, 0x37, 0xd3, 0xdd, 0x5e, 0x6a, 0xaf, 0x6c,
+ 0x89, 0x30, 0x95, 0x8b, 0x76, 0x2f, 0x88, 0xca, 0xa2, 0x1f, 0xd8, 0x2b,
+ 0x4b, 0xcd, 0x45, 0x3b, 0xdd, 0x16, 0xe5, 0x1a, 0x92, 0x44, 0x5d, 0xf8,
+ 0xb5, 0x86, 0xa8, 0x57, 0x97, 0xdf, 0xad, 0x76, 0xea, 0xcd, 0xa6, 0x5f,
+ 0x5d, 0x6e, 0x2c, 0xc9, 0xe5, 0x66, 0xdd, 0xab, 0x55, 0x9b, 0xa2, 0x7e,
+ 0xa9, 0xb3, 0x55, 0xdf, 0x6a, 0xd6, 0x7c, 0x75, 0xea, 0x50, 0x26, 0x29,
+ 0xae, 0x43, 0x52, 0xa3, 0x52, 0xab, 0x56, 0x9a, 0x65, 0x5f, 0x0e, 0xed,
+ 0xaf, 0xf0, 0xd2, 0x71, 0xae, 0xde, 0x40, 0xe3, 0xde, 0x5d, 0xf3, 0x91,
+ 0xc1, 0xee, 0x73, 0xb2, 0xd8, 0xff, 0x06, 0x63, 0x7f, 0x9b, 0xf9, 0xff,
+ 0x9a, 0xc6, 0xde, 0x55, 0xc5, 0xfb, 0x73, 0x8f, 0x8f, 0xcd, 0xbe, 0xfd,
+ 0xd9, 0xa1, 0xe6, 0x9f, 0x49, 0x87, 0x33, 0xd0, 0xa2, 0xc3, 0x39, 0x38,
+ 0x41, 0x87, 0xb3, 0x90, 0x95, 0xf2, 0x1c, 0x35, 0x0f, 0x0d, 0x6d, 0xab,
+ 0xff, 0x31, 0x9b, 0xc9, 0x73, 0xd4, 0x0c, 0xe2, 0xa5, 0xfc, 0x2e, 0x35,
+ 0x2f, 0xa9, 0xa4, 0x35, 0x58, 0xf9, 0xc0, 0x62, 0x7a, 0x06, 0xbf, 0x00,
+ 0xb5, 0x40, 0x48, 0x13, 0xbc, 0x05, 0x00, 0x00
+};
+
+
template <typename OboeDataFormat> struct OboeAudioIODeviceBufferHelpers {};
template <>
@@ -1064,6 +1143,13 @@ public:
OboeAudioIODeviceType()
: AudioIODeviceType (OboeAudioIODevice::oboeTypeName)
{
+ // the listener must register before the audio manager is accessed
+ audioDevicesListener = GlobalRef (
+ LocalRef<jobject> (getEnv ()->NewObject (
+ JuceAudioDevicesListener,
+ JuceAudioDevicesListener.create, getAppContext().get(),
+ (jlong)this)));
+
// Not using scanForDevices() to maintain behaviour backwards compatible with older APIs
checkAvailableDevices();
}
@@ -1133,11 +1219,29 @@ public:
#endif
}
+ static void handleDevicesChangedCallback (JNIEnv*,
+ OboeAudioIODeviceType& type)
+ {
+ type.checkAvailableDevices ();
+
+ type.callDeviceChangeListeners ();
+ }
+
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
+ METHOD (create, "<init>", "(Landroid/content/Context;J)V") \
+ CALLBACK (generatedCallback<&OboeAudioIODeviceType::handleDevicesChangedCallback>, "handleDevicesChanged", "(J)V")
+
+DECLARE_JNI_CLASS_WITH_BYTECODE (JuceAudioDevicesListener, "com/rmsl/juce/JuceAudioDevicesListener", 29, javaJuceAudioDevicesListener)
+#undef JNI_CLASS_MEMBERS
+
private:
void checkAvailableDevices()
{
auto sampleRates = OboeAudioIODevice::getDefaultSampleRates();
+ inputDevices.clearQuick ();
+ outputDevices.clearQuick ();
+
inputDevices .add ({ "System Default (Input)", oboe::kUnspecified, sampleRates, 1 });
outputDevices.add ({ "System Default (Output)", oboe::kUnspecified, sampleRates, 2 });
@@ -1313,6 +1417,8 @@ public:
Array<DeviceInfo> inputDevices, outputDevices;
+ GlobalRef audioDevicesListener;
+
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (OboeAudioIODeviceType)
};