diff options
| author | Watcom Hecht <watcom.hecht@gmail.com> | 2015-04-19 11:32:51 -0300 |
|---|---|---|
| committer | Watcom Hecht <watcom.hecht@gmail.com> | 2015-04-19 13:28:26 -0300 |
| commit | f779da1a5936a2e7f6c86cf80d99a076761baa80 (patch) | |
| tree | afa302b10aac7522d403abf11f03836f5e910981 /src/print_volume.c | |
| parent | dedea6266bb3771c51493d690f8835beb9520c24 (diff) | |
PulseAudio muted volume support (fixes #27)
Diffstat (limited to 'src/print_volume.c')
| -rw-r--r-- | src/print_volume.c | 24 |
1 files changed, 20 insertions, 4 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 */ |