diff options
| author | Hsin-Yu Chao <hychao@chromium.org> | 2020-09-16 04:36:26 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-09-25 11:41:54 +0000 |
| commit | 5f9f2017f64132052e6a5bf292218c9863b03cd6 (patch) | |
| tree | 9659fb66a4ccea4c390c2275da03de06580d125d | |
| parent | 12e16baf47ac91c14168c4483f8f0b9d9852602a (diff) | |
| download | adhd-5f9f2017f64132052e6a5bf292218c9863b03cd6.tar.gz | |
CRAS: alsa_plugin - Add mixer control from plugin
Add mixer controls from plugin, so that volume mixers can be
used when associated in UCM HiFi.conf.
BUG=b:157992204
TEST=Manual test with viking
Change-Id: Ib99ae6dd3a782aecb1e4b30357b3f4c7634ca73e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/2409400
Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org>
Tested-by: Hsinyu Chao <hychao@chromium.org>
Commit-Queue: Hsinyu Chao <hychao@chromium.org>
| -rw-r--r-- | cras/src/server/cras_alsa_plugin_io.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cras/src/server/cras_alsa_plugin_io.c b/cras/src/server/cras_alsa_plugin_io.c index 0d5f379c..9c557a40 100644 --- a/cras/src/server/cras_alsa_plugin_io.c +++ b/cras/src/server/cras_alsa_plugin_io.c @@ -149,6 +149,16 @@ void alsa_plugin_io_create(enum CRAS_STREAM_DIRECTION direction, DL_APPEND(plugins, plugin); + ucm_sections = ucm_get_sections(plugin->ucm); + DL_FOREACH (ucm_sections, section) { + rc = cras_alsa_mixer_add_controls_in_section(plugin->mixer, + section); + if (rc) + syslog(LOG_ERR, + "Failed adding control to plugin," + "section %s mixer_name %s", + section->name, section->mixer_name); + } plugin->iodev = alsa_iodev_create(0, card_name, 0, pcm_name, "", "", ALSA_CARD_TYPE_USB, 1, /* is first */ @@ -156,7 +166,6 @@ void alsa_plugin_io_create(enum CRAS_STREAM_DIRECTION direction, plugin->hctl, direction, DUMMY_USB_VID, DUMMY_USB_PID, DUMMY_USB_SERIAL_NUMBER); - ucm_sections = ucm_get_sections(plugin->ucm); DL_FOREACH (ucm_sections, section) { if (section->dir != plugin->iodev->direction) continue; |