From 5f64ebdfc57f1a5728a7f84d9c69d3a815f467f1 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Tue, 15 Apr 2014 13:56:07 +0300 Subject: [PATCH] sink, source: Allow calling set_mute() during initialization Currently the alsa sink and source write directly to s->muted during initialization, but I think it's better to avoid direct writes, and use the set_mute() function instead, because that makes it easier to figure out where s->muted is modified. This patch prevents the set_mute() call from crashing in the state assertion. --- src/pulsecore/sink.c | 4 +++- src/pulsecore/source.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index 210f3dcc..18b2848b 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -2196,7 +2196,6 @@ void pa_sink_set_mute(pa_sink *s, bool mute, bool save) { pa_sink_assert_ref(s); pa_assert_ctl_context(); - pa_assert(PA_SINK_IS_LINKED(s->state)); old_muted = s->muted; @@ -2211,6 +2210,9 @@ void pa_sink_set_mute(pa_sink *s, bool mute, bool save) { if (!(s->flags & PA_SINK_DEFERRED_VOLUME) && s->set_mute) s->set_mute(s); + if (!PA_SINK_IS_LINKED(s->state)) + return; + pa_log_debug("The mute of sink %s changed from %s to %s.", s->name, pa_yes_no(old_muted), pa_yes_no(mute)); pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_MUTE, NULL, 0, NULL) == 0); pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index); diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c index da0dc685..bf7e9776 100644 --- a/src/pulsecore/source.c +++ b/src/pulsecore/source.c @@ -1789,7 +1789,6 @@ void pa_source_set_mute(pa_source *s, bool mute, bool save) { pa_source_assert_ref(s); pa_assert_ctl_context(); - pa_assert(PA_SOURCE_IS_LINKED(s->state)); old_muted = s->muted; @@ -1804,6 +1803,9 @@ void pa_source_set_mute(pa_source *s, bool mute, bool save) { if (!(s->flags & PA_SOURCE_DEFERRED_VOLUME) && s->set_mute) s->set_mute(s); + if (!PA_SOURCE_IS_LINKED(s->state)) + return; + pa_log_debug("The mute of source %s changed from %s to %s.", s->name, pa_yes_no(old_muted), pa_yes_no(mute)); pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_MUTE, NULL, 0, NULL) == 0); pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE, s->index); -- 2.39.2