Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handling HearingAid audio devices as Bluetooth

Browse source
This commit is contained in:
Sylvain Berfini 2023-09-25 14:34:47 +02:00
parent 318ab35eab
commit ce9335f0b0
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/linphone/core/CorePreferences.kt
View file

@ -344,6 +344,7 @@ class CorePreferences constructor(private val context: Context) {
config.setBool("app", "user_disabled_self_managed_telecom_manager", value) config.setBool("app", "user_disabled_self_managed_telecom_manager", value)
} }
// Also uses Hearing Aids if available
var routeAudioToBluetoothIfAvailable: Boolean var routeAudioToBluetoothIfAvailable: Boolean
get() = config.getBool("app", "route_audio_to_bluetooth_if_available", true) get() = config.getBool("app", "route_audio_to_bluetooth_if_available", true)
set(value) { set(value) {

24
app/src/main/java/org/linphone/utils/AudioRouteUtils.kt
View file

@ -116,7 +116,7 @@ class AudioRouteUtils {
private fun changeCaptureDeviceToMatchAudioRoute(call: Call?, types: List<AudioDevice.Type>) { private fun changeCaptureDeviceToMatchAudioRoute(call: Call?, types: List<AudioDevice.Type>) {
when (types.first()) { when (types.first()) {
AudioDevice.Type.Bluetooth -> { AudioDevice.Type.Bluetooth, AudioDevice.Type.HearingAid -> {
if (isBluetoothAudioRecorderAvailable()) { if (isBluetoothAudioRecorderAvailable()) {
Log.i( Log.i(
"[Audio Route Helper] Bluetooth device is able to record audio, also change input audio device" "[Audio Route Helper] Bluetooth device is able to record audio, also change input audio device"
@ -166,7 +166,7 @@ class AudioRouteUtils {
AudioDevice.Type.Earpiece -> CallAudioState.ROUTE_EARPIECE AudioDevice.Type.Earpiece -> CallAudioState.ROUTE_EARPIECE
AudioDevice.Type.Speaker -> CallAudioState.ROUTE_SPEAKER AudioDevice.Type.Speaker -> CallAudioState.ROUTE_SPEAKER
AudioDevice.Type.Headphones, AudioDevice.Type.Headset -> CallAudioState.ROUTE_WIRED_HEADSET AudioDevice.Type.Headphones, AudioDevice.Type.Headset -> CallAudioState.ROUTE_WIRED_HEADSET
AudioDevice.Type.Bluetooth, AudioDevice.Type.BluetoothA2DP -> CallAudioState.ROUTE_BLUETOOTH AudioDevice.Type.Bluetooth, AudioDevice.Type.BluetoothA2DP, AudioDevice.Type.HearingAid -> CallAudioState.ROUTE_BLUETOOTH
else -> CallAudioState.ROUTE_WIRED_OR_EARPIECE else -> CallAudioState.ROUTE_WIRED_OR_EARPIECE
} }
Log.i( Log.i(
@ -201,7 +201,11 @@ class AudioRouteUtils {
} }
fun routeAudioToBluetooth(call: Call? = null, skipTelecom: Boolean = false) { fun routeAudioToBluetooth(call: Call? = null, skipTelecom: Boolean = false) {
routeAudioTo(call, arrayListOf(AudioDevice.Type.Bluetooth), skipTelecom) routeAudioTo(
call,
arrayListOf(AudioDevice.Type.Bluetooth, AudioDevice.Type.HearingAid),
skipTelecom
)
} }
fun routeAudioToHeadset(call: Call? = null, skipTelecom: Boolean = false) { fun routeAudioToHeadset(call: Call? = null, skipTelecom: Boolean = false) {
@ -254,12 +258,12 @@ class AudioRouteUtils {
Log.i( Log.i(
"[Audio Route Helper] Playback audio device currently in use is [${audioDevice.deviceName} (${audioDevice.driverName}) ${audioDevice.type}]" "[Audio Route Helper] Playback audio device currently in use is [${audioDevice.deviceName} (${audioDevice.driverName}) ${audioDevice.type}]"
) )
return audioDevice.type == AudioDevice.Type.Bluetooth return audioDevice.type == AudioDevice.Type.Bluetooth || audioDevice.type == AudioDevice.Type.HearingAid
} }
fun isBluetoothAudioRouteAvailable(): Boolean { fun isBluetoothAudioRouteAvailable(): Boolean {
for (audioDevice in coreContext.core.audioDevices) { for (audioDevice in coreContext.core.audioDevices) {
if (audioDevice.type == AudioDevice.Type.Bluetooth && if ((audioDevice.type == AudioDevice.Type.Bluetooth || audioDevice.type == AudioDevice.Type.HearingAid) &&
audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityPlay) audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityPlay)
) { ) {
Log.i( Log.i(
@ -273,7 +277,7 @@ class AudioRouteUtils {
private fun isBluetoothAudioRecorderAvailable(): Boolean { private fun isBluetoothAudioRecorderAvailable(): Boolean {
for (audioDevice in coreContext.core.audioDevices) { for (audioDevice in coreContext.core.audioDevices) {
if (audioDevice.type == AudioDevice.Type.Bluetooth && if ((audioDevice.type == AudioDevice.Type.Bluetooth || audioDevice.type == AudioDevice.Type.HearingAid) &&
audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityRecord) audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityRecord)
) { ) {
Log.i( Log.i(
@ -323,10 +327,10 @@ class AudioRouteUtils {
for (device in coreContext.core.audioDevices) { for (device in coreContext.core.audioDevices) {
if (device.hasCapability(AudioDevice.Capabilities.CapabilityPlay)) { if (device.hasCapability(AudioDevice.Capabilities.CapabilityPlay)) {
when (device.type) { when (device.type) {
AudioDevice.Type.Headphones, AudioDevice.Type.Headset, AudioDevice.Type.HearingAid -> { AudioDevice.Type.Headphones, AudioDevice.Type.Headset -> {
headphonesCard = device.id headphonesCard = device.id
} }
AudioDevice.Type.Bluetooth -> { AudioDevice.Type.Bluetooth, AudioDevice.Type.HearingAid -> {
bluetoothCard = device.id bluetoothCard = device.id
} }
AudioDevice.Type.Speaker -> { AudioDevice.Type.Speaker -> {
@ -354,10 +358,10 @@ class AudioRouteUtils {
for (device in coreContext.core.audioDevices) { for (device in coreContext.core.audioDevices) {
if (device.hasCapability(AudioDevice.Capabilities.CapabilityRecord)) { if (device.hasCapability(AudioDevice.Capabilities.CapabilityRecord)) {
when (device.type) { when (device.type) {
AudioDevice.Type.Bluetooth -> { AudioDevice.Type.Bluetooth, AudioDevice.Type.HearingAid -> {
bluetoothAudioDevice = device bluetoothAudioDevice = device
} }
AudioDevice.Type.Headset, AudioDevice.Type.HearingAid, AudioDevice.Type.Headphones -> { AudioDevice.Type.Headset, AudioDevice.Type.Headphones -> {
headsetAudioDevice = device headsetAudioDevice = device
} }
AudioDevice.Type.Microphone -> { AudioDevice.Type.Microphone -> {