55 lines
1.6 KiB
C++
55 lines
1.6 KiB
C++
$NetBSD: patch-src_mumble_OSS.cpp,v 1.4 2022/04/01 11:53:28 nia Exp $
|
|
|
|
Make device iteration work with NetBSD's OSS compat layer.
|
|
|
|
This is fixed in NetBSD 10.x.
|
|
|
|
--- src/mumble/OSS.cpp.orig 2022-01-18 01:00:00.346014000 +0000
|
|
+++ src/mumble/OSS.cpp
|
|
@@ -123,9 +123,45 @@ void OSSOutputRegistrar::setDeviceChoice
|
|
OSSEnumerator::OSSEnumerator() {
|
|
qhInput.insert(QString(), QLatin1String("Default OSS Device"));
|
|
qhOutput.insert(QString(), QLatin1String("Default OSS Device"));
|
|
+
|
|
+#if defined(__NetBSD__) || defined(__OpenBSD__)
|
|
+ qhDevices.insert(QString(), QLatin1String("/dev/audio"));
|
|
+#else
|
|
qhDevices.insert(QString(), QLatin1String("/dev/dsp"));
|
|
+#endif
|
|
+
|
|
+#if defined(__NetBSD__)
|
|
+ for (int i = 0; i < 32; i++) {
|
|
+ char audiodevname[32];
|
|
+ int fd;
|
|
+ oss_audioinfo ainfo;
|
|
|
|
-#if (SOUND_VERSION >= 0x040002)
|
|
+ ainfo.dev = i;
|
|
+ snprintf(audiodevname, sizeof(audiodevname), "/dev/audio%d", i);
|
|
+ if ((fd = open(audiodevname, O_RDWR)) == -1) {
|
|
+ break;
|
|
+ }
|
|
+ if (ioctl(fd, SNDCTL_AUDIOINFO, &ainfo) == -1) {
|
|
+ close(fd);
|
|
+ qWarning("OSSEnumerator: SNDCTL_AUDIOINFO failed for device %d", i);
|
|
+ continue;
|
|
+ }
|
|
+ close(fd);
|
|
+
|
|
+ QString handle = QLatin1String(ainfo.handle);
|
|
+ QString name = QLatin1String(ainfo.name);
|
|
+ QString device = QLatin1String(ainfo.devnode);
|
|
+
|
|
+ if (ainfo.caps & PCM_CAP_HIDDEN)
|
|
+ continue;
|
|
+
|
|
+ qhDevices.insert(device, device);
|
|
+ if (ainfo.caps & PCM_CAP_INPUT)
|
|
+ qhInput.insert(device, name);
|
|
+ if (ainfo.caps & PCM_CAP_OUTPUT)
|
|
+ qhOutput.insert(device, name);
|
|
+ }
|
|
+#elif (SOUND_VERSION >= 0x040002)
|
|
int mixerfd = open("/dev/mixer", O_RDWR, 0);
|
|
if (mixerfd == -1) {
|
|
qWarning("OSSEnumerator: Failed to open /dev/mixer");
|