marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PulseAudio muted volume support (fixes #27)

Browse Source
This commit is contained in:
Watcom Hecht 2015-04-19 11:32:51 -03:00
parent dedea6266b
commit f779da1a59
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/i3status.h
View File

@ -21,6 +21,9 @@ enum { O_DZEN2,
#define max(a, b) ((a) > (b) ? (a) : (b)) #define max(a, b) ((a) > (b) ? (a) : (b))
#define DEFAULT_SINK_INDEX UINT32_MAX #define DEFAULT_SINK_INDEX UINT32_MAX
#define COMPOSE_VOLUME_MUTE(vol, mute) ((vol) | ((mute) ? (1 << 30) : 0))
#define DECOMPOSE_VOLUME(cvol) ((cvol) & ~(1 << 30))
#define DECOMPOSE_MUTED(cvol) (((cvol) & (1 << 30)) != 0)
#if defined(LINUX) #if defined(LINUX)

24
src/print_volume.c
View File

@ -67,17 +67,33 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
if (!strncasecmp(device, "pulse", strlen("pulse"))) { if (!strncasecmp(device, "pulse", strlen("pulse"))) {
uint32_t sink_idx = device[5] == ':' ? (uint32_t)atoi(device + 6) uint32_t sink_idx = device[5] == ':' ? (uint32_t)atoi(device + 6)
: DEFAULT_SINK_INDEX; : 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 */ /* negative result means error, stick to 0 */
if (ivolume < 0) if (ivolume < 0)
ivolume = 0; ivolume = 0;
outwalk = apply_volume_format(fmt, outwalk, ivolume); outwalk = apply_volume_format(muted ? fmt_muted : fmt,
outwalk,
ivolume);
goto out; goto out;
} else if (!strcasecmp(device, "default") && pulse_initialize()) { } else if (!strcasecmp(device, "default") && pulse_initialize()) {
/* no device specified or "default" set */ /* 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) { 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; goto out;
} }
/* negative result means error, fail PulseAudio attempt */ /* negative result means error, fail PulseAudio attempt */

7
src/pulse.c
View File

@ -79,14 +79,15 @@ static void store_volume_from_sink_cb(pa_context *c,
int avg_vol = pa_cvolume_avg(&info->volume); int avg_vol = pa_cvolume_avg(&info->volume);
int vol_perc = (int)((long long)avg_vol * 100 / PA_VOLUME_NORM); 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 /* 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 * DEFAULT_SINK_INDEX as the index, and another with its proper value
* (using bitwise OR to avoid early-out logic) */ * (using bitwise OR to avoid early-out logic) */
if ((info->index == default_sink_idx && if ((info->index == default_sink_idx &&
save_volume(DEFAULT_SINK_INDEX, vol_perc)) | save_volume(DEFAULT_SINK_INDEX, composed_volume)) |
save_volume(info->index, vol_perc)) { save_volume(info->index, composed_volume)) {
/* if the volume changed, wake the main thread */ /* if the volume or mute flag changed, wake the main thread */
pthread_mutex_lock(&i3status_sleep_mutex); pthread_mutex_lock(&i3status_sleep_mutex);
pthread_cond_broadcast(&i3status_sleep_cond); pthread_cond_broadcast(&i3status_sleep_cond);
pthread_mutex_unlock(&i3status_sleep_mutex); pthread_mutex_unlock(&i3status_sleep_mutex);