[pulseaudio-discuss] [PATCH] role-ducking: Fix improper unducking behavior in case of operating globally
Sangchul Lee
sangchul1011 at gmail.com
Thu Feb 11 14:11:21 UTC 2016
Fix improper unducking behavior when using this module with "global=1" argument.
BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=93994
Signed-off-by: Sangchul Lee <sc11.lee at samsung.com>
---
src/modules/module-role-ducking.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/modules/module-role-ducking.c b/src/modules/module-role-ducking.c
index 4f9be10..ee31b8c 100644
--- a/src/modules/module-role-ducking.c
+++ b/src/modules/module-role-ducking.c
@@ -96,6 +96,22 @@ static bool sink_has_trigger_streams(struct userdata *u, pa_sink *s, pa_sink_inp
return false;
}
+static bool sinks_have_trigger_streams(struct userdata *u, pa_sink *s, pa_sink_input *ignore) {
+ bool ret = false;
+
+ pa_assert(u);
+
+ if (u->global) {
+ uint32_t idx;
+ PA_IDXSET_FOREACH(s, u->core->sinks, idx)
+ if ((ret = sink_has_trigger_streams(u, s, ignore)))
+ break;
+ } else
+ ret = sink_has_trigger_streams(u, s, ignore);
+
+ return ret;
+}
+
static void apply_ducking_to_sink(struct userdata *u, pa_sink *s, pa_sink_input *ignore, bool duck) {
pa_sink_input *j;
uint32_t idx, role_idx;
@@ -163,7 +179,7 @@ static pa_hook_result_t process(struct userdata *u, pa_sink_input *i, bool duck)
if (!i->sink)
return PA_HOOK_OK;
- should_duck = sink_has_trigger_streams(u, i->sink, duck ? NULL : i);
+ should_duck = sinks_have_trigger_streams(u, i->sink, duck ? NULL : i);
apply_ducking(u, i->sink, duck ? NULL : i, should_duck);
return PA_HOOK_OK;
--
2.1.4
More information about the pulseaudio-discuss
mailing list