diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-01-26 16:46:33 +0100 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-01-26 20:01:27 +0100 |
| commit | 071dbd5037e402c74efc8e7fa802210dac671a8b (patch) | |
| tree | fcfaa5c5aadf26ee32f81ec9fbb8b8cfa341fbb1 /audio/audio_hw.c | |
| parent | a615d796bac52e83155163acf2e456ec4ebd556a (diff) | |
| download | device_samsung_p3100-replicant-4.0+audio-WIP.zip device_samsung_p3100-replicant-4.0+audio-WIP.tar.gz device_samsung_p3100-replicant-4.0+audio-WIP.tar.bz2 | |
Backport audio/ to ics and activate it.replicant-4.0+audio-WIP
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Diffstat (limited to 'audio/audio_hw.c')
| -rwxr-xr-x | audio/audio_hw.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 01f2b2b..245ab92 100755 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -42,6 +42,7 @@ #include <hardware/audio_effect.h> #include <audio_effects/effect_aec.h> +#include "compat.h" #include "audio_hw.h" #include "ril_interface.h" @@ -571,7 +572,7 @@ static void select_mode(struct espresso_audio_device *adev) change, even if the device selection did not change. */ if (adev->out_device == AUDIO_DEVICE_OUT_SPEAKER) { adev->out_device = AUDIO_DEVICE_OUT_EARPIECE; - adev->in_device = AUDIO_DEVICE_IN_BUILTIN_MIC & ~AUDIO_DEVICE_BIT_IN; + adev->in_device = AUDIO_DEVICE_IN_BUILTIN_MIC; } else adev->out_device &= ~AUDIO_DEVICE_OUT_SPEAKER; select_output_device(adev); @@ -1572,7 +1573,7 @@ static int in_set_parameters(struct audio_stream *stream, const char *kvpairs) ret = str_parms_get_str(parms, AUDIO_PARAMETER_STREAM_ROUTING, value, sizeof(value)); if (ret >= 0) { - val = atoi(value) & ~AUDIO_DEVICE_BIT_IN; + val = atoi(value); if ((in->device != val) && (val != 0)) { in->device = val; do_standby = true; @@ -2710,7 +2711,7 @@ static int adev_open_input_stream(struct audio_hw_device *dev, in->dev = ladev; in->standby = 1; - in->device = devices & ~AUDIO_DEVICE_BIT_IN; + in->device = devices; *stream_in = &in->stream; return 0; @@ -3037,7 +3038,7 @@ static int adev_open(const hw_module_t* module, const char* name, pthread_mutex_init(&adev->lock, NULL); adev->mode = AUDIO_MODE_NORMAL; adev->out_device = AUDIO_DEVICE_OUT_SPEAKER; - adev->in_device = AUDIO_DEVICE_IN_BUILTIN_MIC & ~AUDIO_DEVICE_BIT_IN; + adev->in_device = AUDIO_DEVICE_IN_BUILTIN_MIC; select_devices(adev); adev->pcm_modem_dl = NULL; |