diff options
| author | Simon Wilson <simonwilson@google.com> | 2011-09-19 17:22:01 -0700 |
|---|---|---|
| committer | Simon Wilson <simonwilson@google.com> | 2011-09-19 18:08:34 -0700 |
| commit | e9ab081e1632c323d36957e04a54f89359fed90e (patch) | |
| tree | 512b73494050a75c08bef7b844bdbd0b831ce3f5 /audio | |
| parent | f04ac990aed06bada948d2a13d373dc8f6783f8b (diff) | |
| download | device_samsung_tuna-e9ab081e1632c323d36957e04a54f89359fed90e.zip device_samsung_tuna-e9ab081e1632c323d36957e04a54f89359fed90e.tar.gz device_samsung_tuna-e9ab081e1632c323d36957e04a54f89359fed90e.tar.bz2 | |
Revert "audio: change mixer name for earpiece control"
This reverts commit 6844413bd8fcc4139eb106a4bdf903aaf90598df.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio_hw.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 93da0bf..3c42222 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -68,7 +68,7 @@ #define MIXER_HS_RIGHT_PLAYBACK "HS Right Playback" #define MIXER_HF_LEFT_PLAYBACK "HF Left Playback" #define MIXER_HF_RIGHT_PLAYBACK "HF Right Playback" -#define MIXER_EARPHONE_PLAYBACK "Earphone Playback" +#define MIXER_EARPHONE_ENABLE_SWITCH "Earphone Enable Switch" #define MIXER_ANALOG_LEFT_CAPTURE_ROUTE "Analog Left Capture Route" #define MIXER_ANALOG_RIGHT_CAPTURE_ROUTE "Analog Right Capture Route" @@ -395,7 +395,7 @@ struct mixer_ctls struct mixer_ctl *mm_dl2; struct mixer_ctl *vx_dl1; struct mixer_ctl *vx_dl2; - struct mixer_ctl *earpiece_playback; + struct mixer_ctl *earpiece_enable; struct mixer_ctl *dl1_headset; struct mixer_ctl *dl1_bt; struct mixer_ctl *left_capture; @@ -766,11 +766,10 @@ static void select_output_device(struct tuna_audio_device *adev) mixer_ctl_set_value(adev->mixer_ctls.dl1_headset, 0, headset_on | headphone_on | earpiece_on); mixer_ctl_set_value(adev->mixer_ctls.dl1_bt, 0, bt_on); + mixer_ctl_set_value(adev->mixer_ctls.earpiece_enable, 0, earpiece_on); /* select output stage */ - mixer_ctl_set_enum_by_string(adev->mixer_ctls.earpiece_playback, - earpiece_on ? MIXER_PLAYBACK_HS_DAC : "Off"); - set_route_by_array(adev->mixer, hs_output, headset_on | headphone_on); + set_route_by_array(adev->mixer, hs_output, headset_on | headphone_on | earpiece_on); set_route_by_array(adev->mixer, hf_output, speaker_on); /* Special case: select input path if in a call, otherwise @@ -1091,7 +1090,6 @@ static int do_output_standby(struct tuna_stream_out *out) be done when the call is ended */ if (adev->mode != AUDIO_MODE_IN_CALL) { /* FIXME: only works if only one output can be active at a time */ - mixer_ctl_set_enum_by_string(adev->mixer_ctls.earpiece_playback, "Off"); set_route_by_array(adev->mixer, hs_output, 0); set_route_by_array(adev->mixer, hf_output, 0); } @@ -2295,8 +2293,8 @@ static int adev_open(const hw_module_t* module, const char* name, MIXER_DL1_PDM_SWITCH); adev->mixer_ctls.dl1_bt = mixer_get_ctl_by_name(adev->mixer, MIXER_DL1_BT_VX_SWITCH); - adev->mixer_ctls.earpiece_playback = mixer_get_ctl_by_name(adev->mixer, - MIXER_EARPHONE_PLAYBACK); + adev->mixer_ctls.earpiece_enable = mixer_get_ctl_by_name(adev->mixer, + MIXER_EARPHONE_ENABLE_SWITCH); adev->mixer_ctls.left_capture = mixer_get_ctl_by_name(adev->mixer, MIXER_ANALOG_LEFT_CAPTURE_ROUTE); adev->mixer_ctls.right_capture = mixer_get_ctl_by_name(adev->mixer, @@ -2309,7 +2307,7 @@ static int adev_open(const hw_module_t* module, const char* name, if (!adev->mixer_ctls.mm_dl1 || !adev->mixer_ctls.vx_dl1 || !adev->mixer_ctls.mm_dl2 || !adev->mixer_ctls.vx_dl2 || !adev->mixer_ctls.dl1_headset || !adev->mixer_ctls.dl1_bt || - !adev->mixer_ctls.earpiece_playback || !adev->mixer_ctls.left_capture || + !adev->mixer_ctls.earpiece_enable || !adev->mixer_ctls.left_capture || !adev->mixer_ctls.right_capture || !adev->mixer_ctls.amic_ul_volume || !adev->mixer_ctls.sidetone_capture) { mixer_close(adev->mixer); |