diff options
Diffstat (limited to 'audio/2.0/default/Conversions.cpp')
| -rw-r--r-- | audio/2.0/default/Conversions.cpp | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/audio/2.0/default/Conversions.cpp b/audio/2.0/default/Conversions.cpp index e6691851b..edd49c5c3 100644 --- a/audio/2.0/default/Conversions.cpp +++ b/audio/2.0/default/Conversions.cpp @@ -31,31 +31,25 @@ std::string deviceAddressToHal(const DeviceAddress& address) { uint32_t halDevice = static_cast<uint32_t>(address.device); const bool isInput = (halDevice & AUDIO_DEVICE_BIT_IN) != 0; if (isInput) halDevice &= ~AUDIO_DEVICE_BIT_IN; - if ((!isInput && (halDevice & AUDIO_DEVICE_OUT_ALL_A2DP) != 0) - || (isInput && (halDevice & AUDIO_DEVICE_IN_BLUETOOTH_A2DP) != 0)) { - snprintf(halAddress, sizeof(halAddress), - "%02X:%02X:%02X:%02X:%02X:%02X", - address.address.mac[0], address.address.mac[1], address.address.mac[2], - address.address.mac[3], address.address.mac[4], address.address.mac[5]); - } else if ((!isInput && (halDevice & AUDIO_DEVICE_OUT_IP) != 0) - || (isInput && (halDevice & AUDIO_DEVICE_IN_IP) != 0)) { - snprintf(halAddress, sizeof(halAddress), - "%d.%d.%d.%d", - address.address.ipv4[0], address.address.ipv4[1], - address.address.ipv4[2], address.address.ipv4[3]); - } else if ((!isInput && (halDevice & AUDIO_DEVICE_OUT_ALL_USB) != 0) - || (isInput && (halDevice & AUDIO_DEVICE_IN_ALL_USB) != 0)) { - snprintf(halAddress, sizeof(halAddress), - "card=%d;device=%d", - address.address.alsa.card, address.address.alsa.device); - } else if ((!isInput && (halDevice & AUDIO_DEVICE_OUT_BUS) != 0) - || (isInput && (halDevice & AUDIO_DEVICE_IN_BUS) != 0)) { - snprintf(halAddress, sizeof(halAddress), - "%s", address.busAddress.c_str()); - } else if ((!isInput && (halDevice & AUDIO_DEVICE_OUT_REMOTE_SUBMIX)) != 0 - || (isInput && (halDevice & AUDIO_DEVICE_IN_REMOTE_SUBMIX) != 0)) { - snprintf(halAddress, sizeof(halAddress), - "%s", address.rSubmixAddress.c_str()); + if ((!isInput && (halDevice & AUDIO_DEVICE_OUT_ALL_A2DP) != 0) || + (isInput && (halDevice & AUDIO_DEVICE_IN_BLUETOOTH_A2DP) != 0)) { + snprintf(halAddress, sizeof(halAddress), "%02X:%02X:%02X:%02X:%02X:%02X", + address.address.mac[0], address.address.mac[1], address.address.mac[2], + address.address.mac[3], address.address.mac[4], address.address.mac[5]); + } else if ((!isInput && (halDevice & AUDIO_DEVICE_OUT_IP) != 0) || + (isInput && (halDevice & AUDIO_DEVICE_IN_IP) != 0)) { + snprintf(halAddress, sizeof(halAddress), "%d.%d.%d.%d", address.address.ipv4[0], + address.address.ipv4[1], address.address.ipv4[2], address.address.ipv4[3]); + } else if ((!isInput && (halDevice & AUDIO_DEVICE_OUT_ALL_USB) != 0) || + (isInput && (halDevice & AUDIO_DEVICE_IN_ALL_USB) != 0)) { + snprintf(halAddress, sizeof(halAddress), "card=%d;device=%d", address.address.alsa.card, + address.address.alsa.device); + } else if ((!isInput && (halDevice & AUDIO_DEVICE_OUT_BUS) != 0) || + (isInput && (halDevice & AUDIO_DEVICE_IN_BUS) != 0)) { + snprintf(halAddress, sizeof(halAddress), "%s", address.busAddress.c_str()); + } else if ((!isInput && (halDevice & AUDIO_DEVICE_OUT_REMOTE_SUBMIX)) != 0 || + (isInput && (halDevice & AUDIO_DEVICE_IN_REMOTE_SUBMIX) != 0)) { + snprintf(halAddress, sizeof(halAddress), "%s", address.rSubmixAddress.c_str()); } return halAddress; } |