diff options
| author | Eric Laurent <elaurent@google.com> | 2011-09-09 17:14:19 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2011-09-09 17:14:19 -0700 |
| commit | 494a9150218d73774796c40bc101928034094082 (patch) | |
| tree | 560a0aac456e427214ac3301f1237d59ecd5110d /audio | |
| parent | e7839351d99bf9cbc56a356a3093697b83b49339 (diff) | |
| download | device_samsung_tuna-494a9150218d73774796c40bc101928034094082.zip device_samsung_tuna-494a9150218d73774796c40bc101928034094082.tar.gz device_samsung_tuna-494a9150218d73774796c40bc101928034094082.tar.bz2 | |
Revert "audio : add to support bluetooth with NR & EC functionality"
This reverts commit b48dbbdeab6f28cf99dc25da67e696ac1399c659.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio_hw.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index c846e9e..70e1bc3 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,10 +595,7 @@ 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: - if (adev->bluetooth_nrec) - device_type = SOUND_AUDIO_PATH_BLUETOOTH; - else - device_type = SOUND_AUDIO_PATH_BLUETOOTH_NO_NR; + device_type = SOUND_AUDIO_PATH_BLUETOOTH; break; default: device_type = SOUND_AUDIO_PATH_HANDSET; @@ -2006,14 +2003,6 @@ 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; } @@ -2312,7 +2301,6 @@ 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); |