From d74e904bf4bdd7f1d767a8db09987b90de809579 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 16 Mar 2015 10:00:32 +0100 Subject: clang-format-3.5 -i **/*.[ch], update modeline MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From here on, we’ll use clang-format to automatically format the source. This has worked well in i3, so we are introducing it for i3status. --- src/print_volume.c | 287 +++++++++++++++++++++++++++-------------------------- 1 file changed, 144 insertions(+), 143 deletions(-) (limited to 'src/print_volume.c') diff --git a/src/print_volume.c b/src/print_volume.c index 93868e3..ef1c913 100644 --- a/src/print_volume.c +++ b/src/print_volume.c @@ -1,4 +1,4 @@ -// vim:ts=8:expandtab +// vim:ts=4:sw=4:expandtab #include #include #include @@ -27,154 +27,155 @@ #include "queue.h" void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *fmt_muted, const char *device, const char *mixer, int mixer_idx) { - char *outwalk = buffer; - int pbval = 1; - - /* Printing volume only works with ALSA at the moment */ - if (output_format == O_I3BAR) { - char *instance; - asprintf(&instance, "%s.%s.%d", device, mixer, mixer_idx); - INSTANCE(instance); - free(instance); - } + char *outwalk = buffer; + int pbval = 1; + + /* Printing volume only works with ALSA at the moment */ + if (output_format == O_I3BAR) { + char *instance; + asprintf(&instance, "%s.%s.%d", device, mixer, mixer_idx); + INSTANCE(instance); + free(instance); + } #ifdef LINUX - int err; - snd_mixer_t *m; - snd_mixer_selem_id_t *sid; - snd_mixer_elem_t *elem; - long min, max, val; - int avg; - - if ((err = snd_mixer_open(&m, 0)) < 0) { - fprintf(stderr, "i3status: ALSA: Cannot open mixer: %s\n", snd_strerror(err)); - goto out; - } - - /* Attach this mixer handle to the given device */ - if ((err = snd_mixer_attach(m, device)) < 0) { - fprintf(stderr, "i3status: ALSA: Cannot attach mixer to device: %s\n", snd_strerror(err)); - snd_mixer_close(m); - goto out; - } - - /* Register this mixer */ - if ((err = snd_mixer_selem_register(m, NULL, NULL)) < 0) { - fprintf(stderr, "i3status: ALSA: snd_mixer_selem_register: %s\n", snd_strerror(err)); - snd_mixer_close(m); - goto out; - } - - if ((err = snd_mixer_load(m)) < 0) { - fprintf(stderr, "i3status: ALSA: snd_mixer_load: %s\n", snd_strerror(err)); - snd_mixer_close(m); - goto out; - } - - snd_mixer_selem_id_malloc(&sid); - if (sid == NULL) { - snd_mixer_close(m); - goto out; - } - - /* Find the given mixer */ - 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", - snd_mixer_selem_id_get_name(sid), snd_mixer_selem_id_get_index(sid)); - snd_mixer_close(m); - snd_mixer_selem_id_free(sid); - goto out; - } - - /* Get the volume range to convert the volume later */ - snd_mixer_selem_get_playback_volume_range(elem, &min, &max); - - snd_mixer_handle_events (m); - snd_mixer_selem_get_playback_volume (elem, 0, &val); - if (max != 100) { - float avgf = ((float)val / max) * 100; - avg = (int)avgf; - avg = (avgf - avg < 0.5 ? avg : (avg+1)); - } else avg = (int)val; - - /* Check for mute */ - if (snd_mixer_selem_has_playback_switch(elem)) { - if ((err = snd_mixer_selem_get_playback_switch(elem, 0, &pbval)) < 0) - fprintf (stderr, "i3status: ALSA: playback_switch: %s\n", snd_strerror(err)); - if (!pbval) { - START_COLOR("color_degraded"); - fmt = fmt_muted; - } - } - - snd_mixer_close(m); - snd_mixer_selem_id_free(sid); - - const char *walk = fmt; - for (; *walk != '\0'; walk++) { - if (*walk != '%') { - *(outwalk++) = *walk; - continue; - } - if (BEGINS_WITH(walk+1, "%")) { - outwalk += sprintf(outwalk, "%%"); - walk += strlen("%"); - } - if (BEGINS_WITH(walk+1, "volume")) { - outwalk += sprintf(outwalk, "%d%%", avg); - walk += strlen("volume"); - } - } + int err; + snd_mixer_t *m; + snd_mixer_selem_id_t *sid; + snd_mixer_elem_t *elem; + long min, max, val; + int avg; + + if ((err = snd_mixer_open(&m, 0)) < 0) { + fprintf(stderr, "i3status: ALSA: Cannot open mixer: %s\n", snd_strerror(err)); + goto out; + } + + /* Attach this mixer handle to the given device */ + if ((err = snd_mixer_attach(m, device)) < 0) { + fprintf(stderr, "i3status: ALSA: Cannot attach mixer to device: %s\n", snd_strerror(err)); + snd_mixer_close(m); + goto out; + } + + /* Register this mixer */ + if ((err = snd_mixer_selem_register(m, NULL, NULL)) < 0) { + fprintf(stderr, "i3status: ALSA: snd_mixer_selem_register: %s\n", snd_strerror(err)); + snd_mixer_close(m); + goto out; + } + + if ((err = snd_mixer_load(m)) < 0) { + fprintf(stderr, "i3status: ALSA: snd_mixer_load: %s\n", snd_strerror(err)); + snd_mixer_close(m); + goto out; + } + + snd_mixer_selem_id_malloc(&sid); + if (sid == NULL) { + snd_mixer_close(m); + goto out; + } + + /* Find the given mixer */ + 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", + snd_mixer_selem_id_get_name(sid), snd_mixer_selem_id_get_index(sid)); + snd_mixer_close(m); + snd_mixer_selem_id_free(sid); + goto out; + } + + /* Get the volume range to convert the volume later */ + snd_mixer_selem_get_playback_volume_range(elem, &min, &max); + + snd_mixer_handle_events(m); + snd_mixer_selem_get_playback_volume(elem, 0, &val); + if (max != 100) { + float avgf = ((float)val / max) * 100; + avg = (int)avgf; + avg = (avgf - avg < 0.5 ? avg : (avg + 1)); + } else + avg = (int)val; + + /* Check for mute */ + if (snd_mixer_selem_has_playback_switch(elem)) { + if ((err = snd_mixer_selem_get_playback_switch(elem, 0, &pbval)) < 0) + fprintf(stderr, "i3status: ALSA: playback_switch: %s\n", snd_strerror(err)); + if (!pbval) { + START_COLOR("color_degraded"); + fmt = fmt_muted; + } + } + + snd_mixer_close(m); + snd_mixer_selem_id_free(sid); + + const char *walk = fmt; + for (; *walk != '\0'; walk++) { + if (*walk != '%') { + *(outwalk++) = *walk; + continue; + } + if (BEGINS_WITH(walk + 1, "%")) { + outwalk += sprintf(outwalk, "%%"); + walk += strlen("%"); + } + if (BEGINS_WITH(walk + 1, "volume")) { + outwalk += sprintf(outwalk, "%d%%", avg); + walk += strlen("volume"); + } + } #endif #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - char *mixerpath; - char defaultmixer[] = "/dev/mixer"; - int mixfd, vol, devmask = 0; - pbval = 1; - - if (mixer_idx > 0) - asprintf(&mixerpath, "/dev/mixer%d", mixer_idx); - else - mixerpath = defaultmixer; - - if ((mixfd = open(mixerpath, O_RDWR)) < 0) - return; - - if (mixer_idx > 0) - free(mixerpath); - - if (ioctl(mixfd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) - return; - if (ioctl(mixfd, MIXER_READ(0),&vol) == -1) - return; - - if (((vol & 0x7f) == 0) && (((vol >> 8) & 0x7f) == 0)) { - START_COLOR("color_degraded"); - pbval = 0; + char *mixerpath; + char defaultmixer[] = "/dev/mixer"; + int mixfd, vol, devmask = 0; + pbval = 1; + + if (mixer_idx > 0) + asprintf(&mixerpath, "/dev/mixer%d", mixer_idx); + else + mixerpath = defaultmixer; + + if ((mixfd = open(mixerpath, O_RDWR)) < 0) + return; + + if (mixer_idx > 0) + free(mixerpath); + + if (ioctl(mixfd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) + return; + if (ioctl(mixfd, MIXER_READ(0), &vol) == -1) + return; + + if (((vol & 0x7f) == 0) && (((vol >> 8) & 0x7f) == 0)) { + START_COLOR("color_degraded"); + pbval = 0; + } + + const char *walk = fmt; + for (; *walk != '\0'; walk++) { + if (*walk != '%') { + *(outwalk++) = *walk; + continue; } - - const char *walk = fmt; - for (; *walk != '\0'; walk++) { - if (*walk != '%') { - *(outwalk++) = *walk; - continue; - } - if (BEGINS_WITH(walk+1, "%")) { - outwalk += sprintf(outwalk, "%%"); - walk += strlen("%"); - } - if (BEGINS_WITH(walk+1, "volume")) { - outwalk += sprintf(outwalk, "%d%%", vol & 0x7f); - walk += strlen("volume"); - } + if (BEGINS_WITH(walk + 1, "%")) { + outwalk += sprintf(outwalk, "%%"); + walk += strlen("%"); + } + if (BEGINS_WITH(walk + 1, "volume")) { + outwalk += sprintf(outwalk, "%d%%", vol & 0x7f); + walk += strlen("volume"); } - close(mixfd); + } + close(mixfd); #endif out: - *outwalk = '\0'; - if (!pbval) - END_COLOR; - OUTPUT_FULL_TEXT(buffer); + *outwalk = '\0'; + if (!pbval) + END_COLOR; + OUTPUT_FULL_TEXT(buffer); } -- cgit v1.2.3