From 5173fd2d45d055221bdda88e517686f0d471346e Mon Sep 17 00:00:00 2001 From: Simon Wilson Date: Wed, 28 Sep 2011 14:52:15 -0700 Subject: Revert "audio: defer ril acoustic call until after modem PCM is open" Now that the modem PCMs are never closed for route changes, we don't need to defer the call of set_incall_device() any more. This also fixes a bug where the acoustic property is not sent to the modem upon an output device change now that we don't close/open the modem PCMs for every route change. This reverts commit e1ba1b93ebcc5a6b499ad519d4dfd5bdf7bd7465. Change-Id: I63bc4e25a602d99cd335b7b2a1db4ece45df93e1 --- audio/audio_hw.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'audio') diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 47e3ff7..859b454 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -497,7 +497,6 @@ static void select_input_device(struct tuna_audio_device *adev); static int adev_set_voice_volume(struct audio_hw_device *dev, float volume); static int do_input_standby(struct tuna_stream_in *in); static int do_output_standby(struct tuna_stream_out *out); -static void set_incall_device(struct tuna_audio_device *adev); /* Returns true on devices that must use sidetone capture, * false otherwise. */ @@ -571,8 +570,6 @@ static int start_call(struct tuna_audio_device *adev) pcm_start(adev->pcm_modem_dl); pcm_start(adev->pcm_modem_ul); - set_incall_device(adev); - return 0; err_open_dl: @@ -851,6 +848,8 @@ static void select_output_device(struct tuna_audio_device *adev) /* enable sidetone mixer capture if needed */ sidetone_capture_on = earpiece_on && adev->sidetone_capture; } + + set_incall_device(adev); } mixer_ctl_set_value(adev->mixer_ctls.sidetone_capture, 0, sidetone_capture_on); -- cgit v1.1