mirror of
https://git.freebsd.org/ports.git
synced 2025-06-08 14:20:33 -04:00
1a782b3157
Also: * refresh patches; * change maintainer from ports@ to rodrigo@ - maintainer other alsa ports: audio/alsa-lib audio/alsa-utils (if he is against changing the maintainer, then I will return the old value ports@). PR: 280144 Approved by: rodrigo (maintainer, timeout > 2 weeks)
51 lines
1.8 KiB
C
51 lines
1.8 KiB
C
--- 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;
|