summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlper Nebi Yasak <alpernebiyasak@gmail.com>2021-06-24 11:03:27 +0300
committerPulseAudio Marge Bot <pulseaudio-maintainers@lists.freedesktop.org>2023-03-19 20:51:00 +0000
commitb382a00f8bf937e6825892ea0c971c99018dc466 (patch)
treec635c80a699265105523a06d56417a78d2967bff
parent3aaeb5113d2cec907bd101df22bb28b1a1b8394d (diff)
downloadpulseaudio-b382a00f8bf937e6825892ea0c971c99018dc466.tar.gz
alsa-ucm: Add enable, disable, status helpers for modifiers
These are mostly the same as the device helpers added in c83b34516929 ("alsa-ucm: Add enable, disable, status helpers for devices"), but for modifiers instead. Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/742>
-rw-r--r--src/modules/alsa/alsa-ucm.c68
1 files changed, 54 insertions, 14 deletions
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
index 744e7aae1..ecf296442 100644
--- a/src/modules/alsa/alsa-ucm.c
+++ b/src/modules/alsa/alsa-ucm.c
@@ -702,6 +702,57 @@ static int ucm_get_modifiers(pa_alsa_ucm_verb *verb, snd_use_case_mgr_t *uc_mgr)
return 0;
};
+static long ucm_modifier_status(pa_alsa_ucm_config *ucm, pa_alsa_ucm_modifier *mod) {
+ const char *mod_name = pa_proplist_gets(mod->proplist, PA_ALSA_PROP_UCM_NAME);
+ char *modstatus;
+ long status = 0;
+
+ modstatus = pa_sprintf_malloc("_modstatus/%s", mod_name);
+ if (snd_use_case_geti(ucm->ucm_mgr, modstatus, &status) < 0) {
+ pa_log_debug("Failed to get status for UCM modifier %s", mod_name);
+ status = -1;
+ }
+ pa_xfree(modstatus);
+
+ return status;
+}
+
+static int ucm_modifier_disable(pa_alsa_ucm_config *ucm, pa_alsa_ucm_modifier *mod) {
+ const char *mod_name = pa_proplist_gets(mod->proplist, PA_ALSA_PROP_UCM_NAME);
+
+ /* We don't need to disable modifiers that are already disabled */
+ if (ucm_modifier_status(ucm, mod) == 0) {
+ pa_log_debug("UCM modifier %s is already disabled", mod_name);
+ return 0;
+ }
+
+ pa_log_debug("Disabling UCM modifier %s", mod_name);
+ if (snd_use_case_set(ucm->ucm_mgr, "_dismod", mod_name) < 0) {
+ pa_log("Failed to disable UCM modifier %s", mod_name);
+ return -1;
+ }
+
+ return 0;
+}
+
+static int ucm_modifier_enable(pa_alsa_ucm_config *ucm, pa_alsa_ucm_modifier *mod) {
+ const char *mod_name = pa_proplist_gets(mod->proplist, PA_ALSA_PROP_UCM_NAME);
+
+ /* We don't need to enable modifiers that are already enabled */
+ if (ucm_modifier_status(ucm, mod) > 0) {
+ pa_log_debug("UCM modifier %s is already enabled", mod_name);
+ return 0;
+ }
+
+ pa_log_debug("Enabling UCM modifier %s", mod_name);
+ if (snd_use_case_set(ucm->ucm_mgr, "_enamod", mod_name) < 0) {
+ pa_log("Failed to enable UCM modifier %s", mod_name);
+ return -1;
+ }
+
+ return 0;
+}
+
static void add_role_to_device(pa_alsa_ucm_device *dev, const char *dev_name, const char *role_name, const char *role) {
const char *cur = pa_proplist_gets(dev->proplist, role_name);
@@ -2298,12 +2349,7 @@ void pa_alsa_ucm_roled_stream_begin(pa_alsa_ucm_config *ucm, const char *role, p
PA_LLIST_FOREACH(mod, ucm->active_verb->modifiers) {
if ((mod->action_direction == dir) && (pa_streq(mod->media_role, role))) {
if (mod->enabled_counter == 0) {
- const char *mod_name = pa_proplist_gets(mod->proplist, PA_ALSA_PROP_UCM_NAME);
-
- pa_log_info("Enable ucm modifier %s", mod_name);
- if (snd_use_case_set(ucm->ucm_mgr, "_enamod", mod_name) < 0) {
- pa_log("Failed to enable ucm modifier %s", mod_name);
- }
+ ucm_modifier_enable(ucm, mod);
}
mod->enabled_counter++;
@@ -2323,14 +2369,8 @@ void pa_alsa_ucm_roled_stream_end(pa_alsa_ucm_config *ucm, const char *role, pa_
if ((mod->action_direction == dir) && (pa_streq(mod->media_role, role))) {
mod->enabled_counter--;
- if (mod->enabled_counter == 0) {
- const char *mod_name = pa_proplist_gets(mod->proplist, PA_ALSA_PROP_UCM_NAME);
-
- pa_log_info("Disable ucm modifier %s", mod_name);
- if (snd_use_case_set(ucm->ucm_mgr, "_dismod", mod_name) < 0) {
- pa_log("Failed to disable ucm modifier %s", mod_name);
- }
- }
+ if (mod->enabled_counter == 0)
+ ucm_modifier_disable(ucm, mod);
break;
}