diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/print_volume.c | 24 | ||||
| -rw-r--r-- | src/pulse.c | 7 |
2 files changed, 24 insertions, 7 deletions
diff --git a/src/print_volume.c b/src/print_volume.c index 4359ac1..b1a7e74 100644 --- a/src/print_volume.c +++ b/src/print_volume.c @@ -67,17 +67,33 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * if (!strncasecmp(device, "pulse", strlen("pulse"))) { uint32_t sink_idx = device[5] == ':' ? (uint32_t)atoi(device + 6) : DEFAULT_SINK_INDEX; - int ivolume = pulse_initialize() ? volume_pulseaudio(sink_idx) : 0; + int cvolume = pulse_initialize() ? volume_pulseaudio(sink_idx) : 0; + int ivolume = DECOMPOSE_VOLUME(cvolume); + bool muted = DECOMPOSE_MUTED(cvolume); + if (muted) { + START_COLOR("color_degraded"); + pbval = 0; + } /* negative result means error, stick to 0 */ if (ivolume < 0) ivolume = 0; - outwalk = apply_volume_format(fmt, outwalk, ivolume); + outwalk = apply_volume_format(muted ? fmt_muted : fmt, + outwalk, + ivolume); goto out; } else if (!strcasecmp(device, "default") && pulse_initialize()) { /* no device specified or "default" set */ - int ivolume = volume_pulseaudio(DEFAULT_SINK_INDEX); + int cvolume = volume_pulseaudio(DEFAULT_SINK_INDEX); + int ivolume = DECOMPOSE_VOLUME(cvolume); + bool muted = DECOMPOSE_MUTED(cvolume); if (ivolume >= 0) { - outwalk = apply_volume_format(fmt, outwalk, ivolume); + if (muted) { + START_COLOR("color_degraded"); + pbval = 0; + } + outwalk = apply_volume_format(muted ? fmt_muted : fmt, + outwalk, + ivolume); goto out; } /* negative result means error, fail PulseAudio attempt */ 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); |