From 6842f434b66f8ad8a9a2585d92165ef51f48d4cd Mon Sep 17 00:00:00 2001 From: OBATA Akio Date: Sun, 31 May 2020 17:54:31 +0900 Subject: [PATCH] mpeglib: change to use SunOS API audioIO backend for NetBSD On NetBSD, SunOS compatible native API should be used instead of OSS audio emulator layer. Signed-off-by: OBATA Akio (cherry picked from commit 6dfc5bfda892be55a40a7f3d79c2e27396106f68) --- mpeglib/lib/util/audio/audioIO.cpp | 2 ++ mpeglib/lib/util/audio/audioIO_SunOS.cpp | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mpeglib/lib/util/audio/audioIO.cpp b/mpeglib/lib/util/audio/audioIO.cpp index f2a1f7cb..ec84aa21 100644 --- a/mpeglib/lib/util/audio/audioIO.cpp +++ b/mpeglib/lib/util/audio/audioIO.cpp @@ -28,6 +28,8 @@ #ifdef OS_BSD #ifdef __OpenBSD__ #include "audioIO_sndio.cpp" +#elif defined(__NetBSD__) + #include "audioIO_SunOS.cpp" #else #include "audioIO_Linux.cpp" #endif diff --git a/mpeglib/lib/util/audio/audioIO_SunOS.cpp b/mpeglib/lib/util/audio/audioIO_SunOS.cpp index 4e9958a1..afbb28e3 100644 --- a/mpeglib/lib/util/audio/audioIO_SunOS.cpp +++ b/mpeglib/lib/util/audio/audioIO_SunOS.cpp @@ -8,13 +8,19 @@ */ #include +#ifdef OS_SunOS #include +#else +#include +#endif #include #include #include #include +#ifdef OS_BSD +#define uchar_t u_char +#endif #include "audioIO.h" -#include /* declare these static to effectively isolate the audio device */