diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-06-08 00:02:15 +0200 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2009-06-08 22:31:50 +0100 |
| commit | d52262367aea179674762344cced386b7d5522f1 (patch) | |
| tree | 7080362d04f60325a11390391294dc4f212db759 | |
| parent | 56f457c10d0bd45714a1d2d033ecedab9b46439a (diff) | |
core: make sure soft mute status stays in sync with hw mute status
This should close rhbz #494851, mandriva bz #51234.
Probably the same as our own #572, launchpad #352732.
| -rw-r--r-- | src/modules/alsa/alsa-sink.c | 2 | ||||
| -rw-r--r-- | src/modules/alsa/alsa-source.c | 2 | ||||
| -rw-r--r-- | src/pulsecore/sink.c | 6 | ||||
| -rw-r--r-- | src/pulsecore/source.c | 6 |
4 files changed, 12 insertions, 4 deletions
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c index 360cb4d5..a544b586 100644 --- a/src/modules/alsa/alsa-sink.c +++ b/src/modules/alsa/alsa-sink.c @@ -1146,7 +1146,7 @@ fail: static void sink_get_mute_cb(pa_sink *s) { struct userdata *u = s->userdata; - int err, sw; + int err, sw = 0; pa_assert(u); pa_assert(u->mixer_elem); diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c index 19c6cfcd..5d8e3492 100644 --- a/src/modules/alsa/alsa-source.c +++ b/src/modules/alsa/alsa-source.c @@ -1105,7 +1105,7 @@ fail: static void source_get_mute_cb(pa_source *s) { struct userdata *u = s->userdata; - int err, sw; + int err, sw = 0; pa_assert(u); pa_assert(u->mixer_elem); diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index 30fa5579..c99f9a8f 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -1272,8 +1272,12 @@ pa_bool_t pa_sink_get_mute(pa_sink *s, pa_bool_t force_refresh) { pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_MUTE, NULL, 0, NULL) == 0); - if (old_muted != s->muted) + if (old_muted != s->muted) { pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index); + + /* Make sure the soft mute status stays in sync */ + pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_MUTE, NULL, 0, NULL) == 0); + } } return s->muted; diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c index 21902509..0baaed11 100644 --- a/src/pulsecore/source.c +++ b/src/pulsecore/source.c @@ -757,8 +757,12 @@ pa_bool_t pa_source_get_mute(pa_source *s, pa_bool_t force_refresh) { pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_GET_MUTE, NULL, 0, NULL) == 0); - if (old_muted != s->muted) + if (old_muted != s->muted) { pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE, s->index); + + /* Make sure the soft mute status stays in sync */ + pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_MUTE, NULL, 0, NULL) == 0); + } } return s->muted; |