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

Oboe: Don't add unknown audio device types to device list

Browse source
This commit is contained in:
ed 2020-07-01 17:14:45 +01:00
parent fa4e8c2d9d
commit 877f47dd53
1 changed files with 35 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

66
modules/juce_audio_devices/native/juce_android_Oboe.cpp
View file

@ -1211,9 +1211,13 @@ public:
jmethodID getChannelCountsMethod = env->GetMethodID (deviceClass, "getChannelCounts", "()[I");
jmethodID isSourceMethod = env->GetMethodID (deviceClass, "isSource", "()Z");
auto name = juceString ((jstring) env->CallObjectMethod (device, getProductNameMethod));
name << deviceTypeToString (env->CallIntMethod (device, getTypeMethod));
int id = env->CallIntMethod (device, getIdMethod);
auto deviceTypeString = deviceTypeToString (env->CallIntMethod (device, getTypeMethod));
if (deviceTypeString.isEmpty()) // unknown device
return;
auto name = juceString ((jstring) env->CallObjectMethod (device, getProductNameMethod)) + " " + deviceTypeString;
auto id = env->CallIntMethod (device, getIdMethod);
auto jSampleRates = LocalRef<jintArray> ((jintArray) env->CallObjectMethod (device, getSampleRatesMethod));
auto sampleRates = jintArrayToJuceArray (jSampleRates);
@ -1222,42 +1226,42 @@ public:
auto channelCounts = jintArrayToJuceArray (jChannelCounts);
int numChannels = channelCounts.isEmpty() ? -1 : channelCounts.getLast();
bool isInput = env->CallBooleanMethod (device, isSourceMethod);
auto isInput = env->CallBooleanMethod (device, isSourceMethod);
auto& devices = isInput ? inputDevices : outputDevices;
devices.add ({ name, id, sampleRates, numChannels });
}
static const char* deviceTypeToString (int type)
static String deviceTypeToString (int type)
{
switch (type)
{
case 0: return "";
case 1: return " built-in earphone speaker";
case 2: return " built-in speaker";
case 3: return " wired headset";
case 4: return " wired headphones";
case 5: return " line analog";
case 6: return " line digital";
case 7: return " Bluetooth device typically used for telephony";
case 8: return " Bluetooth device supporting the A2DP profile";
case 9: return " HDMI";
case 10: return " HDMI audio return channel";
case 11: return " USB device";
case 12: return " USB accessory";
case 13: return " DOCK";
case 14: return " FM";
case 15: return " built-in microphone";
case 16: return " FM tuner";
case 17: return " TV tuner";
case 18: return " telephony";
case 19: return " auxiliary line-level connectors";
case 20: return " IP";
case 21: return " BUS";
case 22: return " USB headset";
case 23: return " hearing aid";
case 24: return " built-in speaker safe";
default: jassertfalse; return ""; // type not supported yet, needs to be added!
case 0: return {};
case 1: return "built-in earphone speaker";
case 2: return "built-in speaker";
case 3: return "wired headset";
case 4: return "wired headphones";
case 5: return "line analog";
case 6: return "line digital";
case 7: return "Bluetooth device typically used for telephony";
case 8: return "Bluetooth device supporting the A2DP profile";
case 9: return "HDMI";
case 10: return "HDMI audio return channel";
case 11: return "USB device";
case 12: return "USB accessory";
case 13: return "DOCK";
case 14: return "FM";
case 15: return "built-in microphone";
case 16: return "FM tuner";
case 17: return "TV tuner";
case 18: return "telephony";
case 19: return "auxiliary line-level connectors";
case 20: return "IP";
case 21: return "BUS";
case 22: return "USB headset";
case 23: return "hearing aid";
case 24: return "built-in speaker safe";
default: jassertfalse; return {}; // type not supported yet, needs to be added!
}
}