mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

stream-interaction: Extend trigger groups to module-role-cork

Browse source 
For module-role-ducking, trigger and ducking groups were introduced some years
ago. This patch extends the functionality to module-role-cork, so that trigger
and cork roles may now contain "/" separated groups.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/767>
This commit is contained in:
Georg Chini 2023-01-07 19:45:17 +01:00 • committed by PulseAudio Marge Bot
parent 33129c88dc
commit 94dd7b4b7b
1 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/modules/stream-interaction.c
View file

@ -423,6 +423,9 @@ int pa_stream_interaction_init(pa_module *m, const char* const v_modargs[]) {
bool global = false; bool global = false;
bool source_trigger = false; bool source_trigger = false;
uint32_t i = 0; uint32_t i = 0;
uint32_t group_count_tr = 0;
uint32_t group_count_du = 0;
uint32_t group_count_vol = 0;
pa_assert(m); pa_assert(m);
@ -441,30 +444,28 @@ int pa_stream_interaction_init(pa_module *m, const char* const v_modargs[]) {
u->n_groups = 1; u->n_groups = 1;
roles = pa_modargs_get_value(ma, "trigger_roles", NULL);
if (roles) {
const char *split_state = NULL;
char *n = NULL;
while ((n = pa_split(roles, "/", &split_state))) {
group_count_tr++;
pa_xfree(n);
}
}
roles = pa_modargs_get_value(ma, u->duck ? "ducking_roles" : "cork_roles", NULL);
if (roles) {
const char *split_state = NULL;
char *n = NULL;
while ((n = pa_split(roles, "/", &split_state))) {
group_count_du++;
pa_xfree(n);
}
}
if (u->duck) { if (u->duck) {
const char *volumes; const char *volumes;
uint32_t group_count_tr = 0;
uint32_t group_count_du = 0;
uint32_t group_count_vol = 0;
roles = pa_modargs_get_value(ma, "trigger_roles", NULL);
if (roles) {
const char *split_state = NULL;
char *n = NULL;
while ((n = pa_split(roles, "/", &split_state))) {
group_count_tr++;
pa_xfree(n);
}
}
roles = pa_modargs_get_value(ma, "ducking_roles", NULL);
if (roles) {
const char *split_state = NULL;
char *n = NULL;
while ((n = pa_split(roles, "/", &split_state))) {
group_count_du++;
pa_xfree(n);
}
}
volumes = pa_modargs_get_value(ma, "volume", NULL); volumes = pa_modargs_get_value(ma, "volume", NULL);
if (volumes) { if (volumes) {
const char *split_state = NULL; const char *split_state = NULL;
@ -480,11 +481,16 @@ int pa_stream_interaction_init(pa_module *m, const char* const v_modargs[]) {
pa_log("Invalid number of groups"); pa_log("Invalid number of groups");
goto fail; goto fail;
} }
} else {
if (group_count_tr > 0) if ((group_count_tr > 1 || group_count_du > 1) && (group_count_tr != group_count_du)) {
u->n_groups = group_count_tr; pa_log("Invalid number of groups");
goto fail;
}
} }
if (group_count_tr > 0)
u->n_groups = group_count_tr;
u->groups = pa_xnew0(struct group*, u->n_groups); u->groups = pa_xnew0(struct group*, u->n_groups);
for (i = 0; i < u->n_groups; i++) { for (i = 0; i < u->n_groups; i++) {
u->groups[i] = pa_xnew0(struct group, 1); u->groups[i] = pa_xnew0(struct group, 1);