oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

oss: Remove use of the soundcard.h header, OpenBSD no longer uses OSS

Browse Source
This commit is contained in:
Brad Smith
2023-02-03 18:38:20 -05:00
parent a41414e0e0
commit e0df0b6d74
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/oss/meson.build
View File

@@ -4,7 +4,7 @@ if enable_oss.disabled()
elif enable_oss.auto() and alsa_dep.found() elif enable_oss.auto() and alsa_dep.found()
# don't bother auto-enabling OSS if ALSA is available # don't bother auto-enabling OSS if ALSA is available
enable_oss = false enable_oss = false
elif compiler.has_header('sys/soundcard.h') or compiler.has_header('soundcard.h') elif compiler.has_header('sys/soundcard.h')
enable_oss = true enable_oss = true
elif enable_oss.auto() elif enable_oss.auto()
enable_oss = false enable_oss = false

6
src/mixer/plugins/OssMixerPlugin.cxx
View File

@@ -35,11 +35,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#if defined(__OpenBSD__) || defined(__NetBSD__) #include <sys/soundcard.h>
# include <soundcard.h>
#else /* !(defined(__OpenBSD__) || defined(__NetBSD__) */
# include <sys/soundcard.h>
#endif /* !(defined(__OpenBSD__) || defined(__NetBSD__) */
#define VOLUME_MIXER_OSS_DEFAULT "/dev/mixer" #define VOLUME_MIXER_OSS_DEFAULT "/dev/mixer"

6
src/output/plugins/OssOutputPlugin.cxx
View File

@@ -39,11 +39,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#if defined(__OpenBSD__) || defined(__NetBSD__) #include <sys/soundcard.h>
# include <soundcard.h>
#else /* !(defined(__OpenBSD__) || defined(__NetBSD__) */
# include <sys/soundcard.h>
#endif /* !(defined(__OpenBSD__) || defined(__NetBSD__) */
/* We got bug reports from FreeBSD users who said that the two 24 bit /* We got bug reports from FreeBSD users who said that the two 24 bit
formats generate white noise on FreeBSD, but 32 bit works. This is formats generate white noise on FreeBSD, but 32 bit works. This is