diff options
| author | Yao-Wen Mao <yaowen@google.com> | 2015-09-02 16:36:03 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-09-10 05:29:51 -0700 |
| commit | d21516ae3065cd2bdc992b43ebcdad7b2b1fd778 (patch) | |
| tree | 048da277b7de181840f033a4887a7abb5407b1c2 /cras/src/server/cras_alsa_jack.c | |
| parent | 248881f8d320ad5a93a51b52be1ab45fba3f5365 (diff) | |
| download | adhd-d21516ae3065cd2bdc992b43ebcdad7b2b1fd778.tar.gz | |
CRAS: alsa_mixer - refactor the mixer control structure.
Use mixer_control as a unified interface and hide the definition of it.
mixer_output_control is a derived structure from mixer_control.
Store additional information for output control in it.
BUG=None
TEST=None
Change-Id: I910f572d4ec12fdd5b9a72ef80f937050285dbb5
Reviewed-on: https://chromium-review.googlesource.com/298004
Commit-Ready: Yao-Wen Mao <yaowen@google.com>
Tested-by: Yao-Wen Mao <yaowen@google.com>
Reviewed-by: Yao-Wen Mao <yaowen@google.com>
Diffstat (limited to 'cras/src/server/cras_alsa_jack.c')
| -rw-r--r-- | cras/src/server/cras_alsa_jack.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cras/src/server/cras_alsa_jack.c b/cras/src/server/cras_alsa_jack.c index b2015604..a96a24ed 100644 --- a/cras/src/server/cras_alsa_jack.c +++ b/cras/src/server/cras_alsa_jack.c @@ -82,8 +82,8 @@ struct cras_alsa_jack { snd_hctl_elem_t *eld_control; struct cras_alsa_jack_list *jack_list; - struct cras_alsa_mixer_output *mixer_output; - struct mixer_volume_control *mixer_input; + struct mixer_control *mixer_output; + struct mixer_control *mixer_input; char *ucm_device; const char *dsp_name; const char* override_type_name; @@ -872,7 +872,7 @@ void cras_alsa_jack_list_destroy(struct cras_alsa_jack_list *jack_list) free(jack_list); } -struct cras_alsa_mixer_output *cras_alsa_jack_get_mixer_output( +struct mixer_control *cras_alsa_jack_get_mixer_output( const struct cras_alsa_jack *jack) { if (jack == NULL) @@ -880,7 +880,7 @@ struct cras_alsa_mixer_output *cras_alsa_jack_get_mixer_output( return jack->mixer_output; } -struct mixer_volume_control *cras_alsa_jack_get_mixer_input( +struct mixer_control *cras_alsa_jack_get_mixer_input( const struct cras_alsa_jack *jack) { return jack ? jack->mixer_input : NULL; |