cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent xstatbar to hang on startup with some audio chip:

Browse Source 
if devinfo.type != AUDIO_MIXER_CLASS is true, xstatbar will never make
progress and loop forever. Fix it by trying the next device.

from Tobias Ulmer, thanks!
ok jasper@ landry@
This commit is contained in:
ajacoutot 2011-08-02 15:17:43 +00:00
parent 1e0b057df7
commit 816c6f0d56
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysutils/xstatbar/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.8 2011/01/18 19:04:22 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.9 2011/08/02 15:17:43 ajacoutot Exp $
ONLY_FOR_ARCHS= ${APM_ARCHS}
COMMENT= simple system monitor bar
DISTNAME= xstatbar-0.5
REVISION= 0
CATEGORIES= sysutils x11

19
sysutils/xstatbar/patches/patch-stats_c Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-stats_c,v 1.5 2011/08/02 15:17:43 ajacoutot Exp $
If devinfo.type != AUDIO_MIXER_CLASS is true, xstatbar will never make
progress and loop forever. Fix it by trying the next device.
--- stats.c.orig Tue Aug 2 17:10:04 2011
+++ stats.c Tue Aug 2 17:11:47 2011
@@ -101,8 +101,10 @@ volume_init()
devinfo.index = 0;
while (ioctl(volume.dev_fd, AUDIO_MIXER_DEVINFO, &devinfo) >= 0) {
- if (devinfo.type != AUDIO_MIXER_CLASS)
+ if (devinfo.type != AUDIO_MIXER_CLASS) {
+ devinfo.index++;
continue;
+ }
if (strncmp(devinfo.label.name, AudioCoutputs, MAX_AUDIO_DEV_LEN) == 0)
oclass_idx = devinfo.index;