From f779da1a5936a2e7f6c86cf80d99a076761baa80 Mon Sep 17 00:00:00 2001 From: Watcom Hecht Date: Sun, 19 Apr 2015 11:32:51 -0300 Subject: PulseAudio muted volume support (fixes #27) --- src/pulse.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/pulse.c') diff --git a/src/pulse.c b/src/pulse.c index 76e2495..5a381a0 100644 --- a/src/pulse.c +++ b/src/pulse.c @@ -79,14 +79,15 @@ static void store_volume_from_sink_cb(pa_context *c, int avg_vol = pa_cvolume_avg(&info->volume); int vol_perc = (int)((long long)avg_vol * 100 / PA_VOLUME_NORM); + int composed_volume = COMPOSE_VOLUME_MUTE(vol_perc, info->mute); /* if this is the default sink we must try to save it twice: once with * DEFAULT_SINK_INDEX as the index, and another with its proper value * (using bitwise OR to avoid early-out logic) */ if ((info->index == default_sink_idx && - save_volume(DEFAULT_SINK_INDEX, vol_perc)) | - save_volume(info->index, vol_perc)) { - /* if the volume changed, wake the main thread */ + save_volume(DEFAULT_SINK_INDEX, composed_volume)) | + save_volume(info->index, composed_volume)) { + /* if the volume or mute flag changed, wake the main thread */ pthread_mutex_lock(&i3status_sleep_mutex); pthread_cond_broadcast(&i3status_sleep_cond); pthread_mutex_unlock(&i3status_sleep_mutex); -- cgit v1.2.3