1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
--- oss/ctl_oss.c.orig 2024-06-10 09:18:39 UTC
+++ oss/ctl_oss.c
@@ -59,7 +59,7 @@ static const char *const vol_devices[SOUND_MIXER_NRDEV
[SOUND_MIXER_CD] = "CD Playback Volume",
[SOUND_MIXER_IMIX] = "Monitor Mix Playback Volume",
[SOUND_MIXER_ALTPCM] = "Headphone Playback Volume",
- [SOUND_MIXER_RECLEV] = "Capture Volume",
+ [SOUND_MIXER_RECLEV] = "Master Capture Volume",
[SOUND_MIXER_IGAIN] = "Capture Volume",
[SOUND_MIXER_OGAIN] = "Playback Volume",
[SOUND_MIXER_LINE1] = "Aux Playback Volume",
@@ -369,7 +369,9 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)
{
snd_config_iterator_t it, next;
const char *device = "/dev/mixer";
+#ifndef __FreeBSD__
struct mixer_info mixinfo;
+#endif
int i, err, val;
snd_ctl_oss_t *oss;
@@ -406,19 +408,29 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)
goto error;
}
+#ifndef __FreeBSD__
if (ioctl(oss->fd, SOUND_MIXER_INFO, &mixinfo) < 0) {
err = -errno;
SNDERR("Cannot get mixer info for device %s", device);
goto error;
}
+#endif
oss->ext.version = SND_CTL_EXT_VERSION;
oss->ext.card_idx = 0; /* FIXME */
+#ifdef __FreeBSD__
+ strncpy(oss->ext.id, "fbsd", sizeof(oss->ext.id) - 1);
+ strcpy(oss->ext.driver, "FreeBSD/OSS plugin");
+ strncpy(oss->ext.name, "FreeBSD/OSS", sizeof(oss->ext.name) - 1);
+ strncpy(oss->ext.longname, "FreeBSD/OSS", sizeof(oss->ext.longname) - 1);
+ strncpy(oss->ext.mixername, "FreeBSD/OSS", sizeof(oss->ext.mixername) - 1);
+#else
strncpy(oss->ext.id, mixinfo.id, sizeof(oss->ext.id) - 1);
strcpy(oss->ext.driver, "OSS-Emulation");
strncpy(oss->ext.name, mixinfo.name, sizeof(oss->ext.name) - 1);
strncpy(oss->ext.longname, mixinfo.name, sizeof(oss->ext.longname) - 1);
strncpy(oss->ext.mixername, mixinfo.name, sizeof(oss->ext.mixername) - 1);
+#endif
oss->ext.poll_fd = -1;
oss->ext.callback = &oss_ext_callback;
oss->ext.private_data = oss;
|
