diff options
| author | toshii <toshii> | 2000-09-01 15:58:36 +0000 |
|---|---|---|
| committer | toshii <toshii> | 2000-09-01 15:58:36 +0000 |
| commit | fc0f081869a0c485212800f0f70ae65c9bf3e60f (patch) | |
| tree | f796ba1abaa467798d100a7512fc614075772bcf /audio | |
| parent | 271aaebb0e4590e78ade8ecc9ca2e8942cdd6bf9 (diff) | |
| download | pkgsrc-fc0f081869a0c485212800f0f70ae65c9bf3e60f.tar.gz | |
Make sure if mixer_devinfo's mixer_class points to a valid index.
(This doesn't hold for uaudio(4), which caused SEGV on startup.)
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/gqmpeg/files/patch-sum | 4 | ||||
| -rw-r--r-- | audio/gqmpeg/patches/patch-ab | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/audio/gqmpeg/files/patch-sum b/audio/gqmpeg/files/patch-sum index a0638c0de82..bb318edc7c0 100644 --- a/audio/gqmpeg/files/patch-sum +++ b/audio/gqmpeg/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.5 2000/08/26 16:41:50 wiz Exp $ +$NetBSD: patch-sum,v 1.6 2000/09/01 15:58:36 toshii Exp $ MD5 (patch-aa) = f276e6a2f0270b78b8ae8c6bff0dcfa5 -MD5 (patch-ab) = b2ace351a9aa9c89bd3b03a417897b5d +MD5 (patch-ab) = d1f18929bd4a5bcc3e72987c934d8b79 diff --git a/audio/gqmpeg/patches/patch-ab b/audio/gqmpeg/patches/patch-ab index 2f360ef4593..8e0650e9e37 100644 --- a/audio/gqmpeg/patches/patch-ab +++ b/audio/gqmpeg/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.11 2000/08/26 16:41:49 wiz Exp $ +$NetBSD: patch-ab,v 1.12 2000/09/01 15:58:37 toshii Exp $ ---- src/mixer.c.orig Mon Jul 24 00:25:50 2000 -+++ src/mixer.c +--- src/mixer.c.orig Mon Jul 24 07:25:50 2000 ++++ src/mixer.c Fri Sep 1 21:42:16 2000 @@ -265,6 +265,17 @@ mixer_devinfo_t *infos; mixer_ctrl_t *values; @@ -20,14 +20,17 @@ $NetBSD: patch-ab,v 1.11 2000/08/26 16:41:49 wiz Exp $ void mixer_init(gint init_device_id) { int fd, i, ndev; -@@ -306,7 +317,9 @@ +@@ -306,7 +317,12 @@ if (infos[i].type == AUDIO_MIXER_VALUE) { DeviceData *device = g_new0(DeviceData, 1); device->device_id = i; - device->device_name = infos[i].label.name; -+ device->device_name = -+ catstr(infos[infos[i].mixer_class].label.name, -+ infos[i].label.name); ++ if (0 <= infos[i].mixer_class && infos[i].mixer_class < ndev) ++ device->device_name = ++ catstr(infos[infos[i].mixer_class].label.name, ++ infos[i].label.name); ++ else ++ device->device_name = infos[i].label.name; device->stereo = 1; device->recordable = 0; device_list = g_list_append(device_list, device); |