summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2011-09-12 09:56:24 -0700
committerEric Laurent <elaurent@google.com>2011-09-12 09:56:24 -0700
commit41a1ead89c547003525468bfd4acb63a2dd8dbd2 (patch)
treecef93e82e8565f5ffa280d22b6c8136fd4cd11f7 /audio
parent3437a82b11978eccc19cfa105ffbd8299b110e93 (diff)
downloaddevice_samsung_tuna-41a1ead89c547003525468bfd4acb63a2dd8dbd2.zip
device_samsung_tuna-41a1ead89c547003525468bfd4acb63a2dd8dbd2.tar.gz
device_samsung_tuna-41a1ead89c547003525468bfd4acb63a2dd8dbd2.tar.bz2
Revert "Revert "audio : add to support bluetooth with NR & EC functionality""
This reverts commit 494a9150218d73774796c40bc101928034094082.
Diffstat (limited to 'audio')
-rw-r--r--audio/audio_hw.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 0a6459d..8d7a11f 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -416,7 +416,7 @@ struct tuna_audio_device {
int tty_mode;
int sidetone_capture;
struct echo_reference_itfe *echo_reference;
-
+ bool bluetooth_nrec;
/* RIL */
struct ril_handle ril;
};
@@ -595,7 +595,10 @@ static void set_incall_device(struct tuna_audio_device *adev)
case AUDIO_DEVICE_OUT_BLUETOOTH_SCO:
case AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET:
case AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT:
- device_type = SOUND_AUDIO_PATH_BLUETOOTH;
+ if (adev->bluetooth_nrec)
+ device_type = SOUND_AUDIO_PATH_BLUETOOTH;
+ else
+ device_type = SOUND_AUDIO_PATH_BLUETOOTH_NO_NR;
break;
default:
device_type = SOUND_AUDIO_PATH_HANDSET;
@@ -2003,6 +2006,14 @@ static int adev_set_parameters(struct audio_hw_device *dev, const char *kvpairs)
pthread_mutex_unlock(&adev->lock);
}
+ ret = str_parms_get_str(parms, AUDIO_PARAMETER_KEY_BT_NREC, value, sizeof(value));
+ if (ret >= 0) {
+ if (strcmp(value, AUDIO_PARAMETER_VALUE_ON) == 0)
+ adev->bluetooth_nrec = true;
+ else
+ adev->bluetooth_nrec = false;
+ }
+
str_parms_destroy(parms);
return ret;
}
@@ -2301,6 +2312,7 @@ static int adev_open(const hw_module_t* module, const char* name,
adev->voice_volume = 1.0f;
adev->tty_mode = TTY_MODE_OFF;
adev->sidetone_capture = needs_sidetone_capture();
+ adev->bluetooth_nrec = true;
/* RIL */
ril_open(&adev->ril);