X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_volume.c;h=c5cf55b6420b7c477122ee0abcf5939779c7b151;hb=52e9f6f63b74db2a6a1d67524851649b18794950;hp=b1a7e7401e49fcf6e94a611a7851698919c7339a;hpb=a1d50689185323af6ac8e656fbd3cbac7adde535;p=i3%2Fi3status diff --git a/src/print_volume.c b/src/print_volume.c index b1a7e74..c5cf55b 100644 --- a/src/print_volume.c +++ b/src/print_volume.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include @@ -21,7 +22,8 @@ #ifdef __OpenBSD__ #include #include -#include +#include +#include #endif #include "i3status.h" @@ -33,15 +35,17 @@ static char *apply_volume_format(const char *fmt, char *outwalk, int ivolume) { for (; *walk != '\0'; walk++) { if (*walk != '%') { *(outwalk++) = *walk; - continue; - } - if (BEGINS_WITH(walk + 1, "%")) { - outwalk += sprintf(outwalk, "%%"); + + } else if (BEGINS_WITH(walk + 1, "%")) { + outwalk += sprintf(outwalk, "%s", pct_mark); walk += strlen("%"); - } - if (BEGINS_WITH(walk + 1, "volume")) { - outwalk += sprintf(outwalk, "%d%%", ivolume); + + } else if (BEGINS_WITH(walk + 1, "volume")) { + outwalk += sprintf(outwalk, "%d%s", ivolume, pct_mark); walk += strlen("volume"); + + } else { + *(outwalk++) = '%'; } } return outwalk; @@ -59,15 +63,19 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * free(instance); } +#ifndef __OpenBSD__ /* Try PulseAudio first */ /* If the device name has the format "pulse[:N]" where N is the * index of the PulseAudio sink then force PulseAudio, optionally * overriding the default sink */ if (!strncasecmp(device, "pulse", strlen("pulse"))) { - uint32_t sink_idx = device[5] == ':' ? (uint32_t)atoi(device + 6) - : DEFAULT_SINK_INDEX; - int cvolume = pulse_initialize() ? volume_pulseaudio(sink_idx) : 0; + uint32_t sink_idx = device[strlen("pulse")] == ':' ? (uint32_t)atoi(device + strlen("pulse:")) : DEFAULT_SINK_INDEX; + const char *sink_name = device[strlen("pulse")] == ':' && + !isdigit(device[strlen("pulse:")]) + ? device + strlen("pulse:") + : NULL; + int cvolume = pulse_initialize() ? volume_pulseaudio(sink_idx, sink_name) : 0; int ivolume = DECOMPOSE_VOLUME(cvolume); bool muted = DECOMPOSE_MUTED(cvolume); if (muted) { @@ -83,7 +91,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * goto out; } else if (!strcasecmp(device, "default") && pulse_initialize()) { /* no device specified or "default" set */ - int cvolume = volume_pulseaudio(DEFAULT_SINK_INDEX); + int cvolume = volume_pulseaudio(DEFAULT_SINK_INDEX, NULL); int ivolume = DECOMPOSE_VOLUME(cvolume); bool muted = DECOMPOSE_MUTED(cvolume); if (ivolume >= 0) { @@ -100,6 +108,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * } /* If some other device was specified or PulseAudio is not detected, * proceed to ALSA / OSS */ +#endif #ifdef LINUX int err; @@ -144,7 +153,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * snd_mixer_selem_id_set_index(sid, mixer_idx); snd_mixer_selem_id_set_name(sid, mixer); if (!(elem = snd_mixer_find_selem(m, sid))) { - fprintf(stderr, "i3status: ALSA: Cannot find mixer %s (index %i)\n", + fprintf(stderr, "i3status: ALSA: Cannot find mixer %s (index %u)\n", snd_mixer_selem_id_get_name(sid), snd_mixer_selem_id_get_index(sid)); snd_mixer_close(m); snd_mixer_selem_id_free(sid); @@ -191,13 +200,84 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * mixerpath = defaultmixer; if ((mixfd = open(mixerpath, O_RDWR)) < 0) { +#if defined(__OpenBSD__) + warn("audioio: Cannot open mixer"); +#else warn("OSS: Cannot open mixer"); +#endif goto out; } if (mixer_idx > 0) free(mixerpath); +#if defined(__OpenBSD__) + int oclass_idx = -1, master_idx = -1, master_mute_idx = -1; + int master_next = AUDIO_MIXER_LAST; + mixer_devinfo_t devinfo, devinfo2; + mixer_ctrl_t vinfo; + + devinfo.index = 0; + while (ioctl(mixfd, AUDIO_MIXER_DEVINFO, &devinfo) >= 0) { + if (devinfo.type != AUDIO_MIXER_CLASS) { + devinfo.index++; + continue; + } + if (strncmp(devinfo.label.name, AudioCoutputs, MAX_AUDIO_DEV_LEN) == 0) + oclass_idx = devinfo.index; + + devinfo.index++; + } + + devinfo2.index = 0; + while (ioctl(mixfd, AUDIO_MIXER_DEVINFO, &devinfo2) >= 0) { + if ((devinfo2.type == AUDIO_MIXER_VALUE) && (devinfo2.mixer_class == oclass_idx) && (strncmp(devinfo2.label.name, AudioNmaster, MAX_AUDIO_DEV_LEN) == 0)) { + master_idx = devinfo2.index; + master_next = devinfo2.next; + } + + if ((devinfo2.type == AUDIO_MIXER_ENUM) && (devinfo2.mixer_class == oclass_idx) && (strncmp(devinfo2.label.name, AudioNmute, MAX_AUDIO_DEV_LEN) == 0)) + if (master_next == devinfo2.index) + master_mute_idx = devinfo2.index; + + if (master_next != AUDIO_MIXER_LAST) + master_next = devinfo2.next; + devinfo2.index++; + } + + if (master_idx == -1) + goto out; + + devinfo.index = master_idx; + if (ioctl(mixfd, AUDIO_MIXER_DEVINFO, &devinfo) == -1) + goto out; + + vinfo.dev = master_idx; + vinfo.type = AUDIO_MIXER_VALUE; + vinfo.un.value.num_channels = devinfo.un.v.num_channels; + if (ioctl(mixfd, AUDIO_MIXER_READ, &vinfo) == -1) + goto out; + + if (AUDIO_MAX_GAIN != 100) { + float avgf = ((float)vinfo.un.value.level[AUDIO_MIXER_LEVEL_MONO] / AUDIO_MAX_GAIN) * 100; + vol = (int)avgf; + vol = (avgf - vol < 0.5 ? vol : (vol + 1)); + } else { + vol = (int)vinfo.un.value.level[AUDIO_MIXER_LEVEL_MONO]; + } + + vinfo.dev = master_mute_idx; + vinfo.type = AUDIO_MIXER_ENUM; + if (ioctl(mixfd, AUDIO_MIXER_READ, &vinfo) == -1) + goto out; + + if (master_mute_idx != -1 && vinfo.un.ord) { + START_COLOR("color_degraded"); + fmt = fmt_muted; + pbval = 0; + } + +#else if (ioctl(mixfd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) { warn("OSS: Cannot read mixer information"); goto out; @@ -212,6 +292,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * pbval = 0; } +#endif outwalk = apply_volume_format(fmt, outwalk, vol & 0x7f); close(mixfd); #endif