X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/7be675f154e3922fb8e2c9309b48f9fa12869817..062f33f8742c645a3b436f609a19219106a8af75:/components/volume.c diff --git a/components/volume.c b/components/volume.c index aa46446..0bfbe08 100644 --- a/components/volume.c +++ b/components/volume.c @@ -21,21 +21,19 @@ vol_perc(const char *card) char *vnames[] = SOUND_DEVICE_NAMES; if ((afd = open(card, O_RDONLY | O_NONBLOCK)) < 0) { - fprintf(stderr, "open '%s': %s\n", card, strerror(errno)); + warn("open '%s':", card); return NULL; } if (ioctl(afd, (int)SOUND_MIXER_READ_DEVMASK, &devmask) < 0) { - fprintf(stderr, "ioctl 'SOUND_MIXER_READ_DEVMASK': %s\n", - strerror(errno)); + warn("ioctl 'SOUND_MIXER_READ_DEVMASK':"); close(afd); return NULL; } for (i = 0; i < LEN(vnames); i++) { if (devmask & (1 << i) && !strcmp("vol", vnames[i])) { if (ioctl(afd, MIXER_READ(i), &v) < 0) { - fprintf(stderr, "ioctl 'MIXER_READ(%ld)': %s\n", i, - strerror(errno)); + warn("ioctl 'MIXER_READ(%ld)':", i); close(afd); return NULL; } @@ -44,5 +42,5 @@ vol_perc(const char *card) close(afd); - return bprintf("%d", v & 0xff); + return bprintf("%d%%", v & 0xff); }