Use Miniaudio for audio output (#115)

Author: drfiemost

Makefile.am

@@ -8,12 +8,6 @@ if MINGW32
   W32_LIBS = -lshlwapi
 endif
 
-if USE_LIBOUT123
-  OUT123_SOURCES = \
-src/audio/out123/audiodrv.cpp \
-src/audio/out123/audiodrv.h
-endif
-
 if USE_ICONV
   ICONV_SOURCES = \
 src/codepages.h
@@ -22,12 +16,10 @@ endif
 AM_CPPFLAGS = \
 -I $(top_builddir)/src \
 -I $(top_srcdir)/src \
+-I $(top_srcdir)/libs/miniaudio \
 -DPKGDATADIR="\"$(pkgdatadir)/\"" \
 $(SIDPLAYFP_CFLAGS) \
 $(STILVIEW_CFLAGS) \
-$(ALSA_CFLAGS) \
-$(PULSE_CFLAGS) \
-$(OUT123_CFLAGS) \
 ${W32_CPPFLAGS} \
 @debug_flags@
 
@@ -40,6 +32,9 @@ src/stilview
 # sidplayfp
 
 src_sidplayfp_SOURCES = \
+libs/miniaudio/osaudio_miniaudio.c \
+libs/miniaudio/osaudio.h \
+libs/miniaudio/miniaudio.h \
 src/IniConfig.cpp \
 src/IniConfig.h \
 src/args.cpp \
@@ -66,21 +61,12 @@ src/audio/AudioConfig.h \
 src/audio/AudioDrv.cpp \
 src/audio/AudioDrv.h \
 src/audio/IAudio.h \
-src/audio/alsa/audiodrv.cpp \
-src/audio/alsa/audiodrv.h \
 src/audio/au/auFile.cpp \
 src/audio/au/auFile.h \
-src/audio/directx/audiodrv.cpp \
-src/audio/directx/audiodrv.h \
-src/audio/mmsystem/audiodrv.cpp \
-src/audio/mmsystem/audiodrv.h \
+src/audio/miniaudio/audiodrv.cpp \
+src/audio/miniaudio/audiodrv.h \
 src/audio/null/null.cpp \
 src/audio/null/null.h \
-src/audio/oss/audiodrv.cpp \
-src/audio/oss/audiodrv.h \
-$(OUT123_SOURCES) \
-src/audio/pulse/audiodrv.cpp \
-src/audio/pulse/audiodrv.h \
 src/audio/wav/WavFile.cpp \
 src/audio/wav/WavFile.h \
 src/ini/iniHandler.h \
@@ -90,12 +76,8 @@ src/ini/types.h
 
 src_sidplayfp_LDADD = \
 $(LIBICONV) \
-$(AUDIO_LDFLAGS) \
 $(SIDPLAYFP_LIBS) \
-$(BUILDERS_LDFLAGS) \
-$(ALSA_LIBS) \
-$(PULSE_LIBS) \
-$(OUT123_LIBS) \
+$(BUILDERS_LDFLAGS)
 $(W32_LIBS)
 
 #=========================================================

README.md

@@ -69,11 +69,15 @@ In addition to the standard build options the following are available:
 compile with debugging messages,
 disabled by default
 
-`--with-out123`:
-build with the out123 library providing support for additional audio interfaces;
-enabled by default
-
 `--with-libiconv-prefix[=DIR]`:
 search for libiconv in DIR/include and DIR/lib
 
 the character conversion requires presence of the POSIX/XSI iconv function family in either the C library or a separate libiconv library (see https://www.gnu.org/software/gettext/manual/html_node/AM_005fICONV.html)
+
+-----------------------------------------------------------------------------
+
+# 3rd party software
+
+* miniaudio
+  https://github.com/mackron/miniaudio
+  distributed under MIT license

configure.ac

@@ -6,8 +6,6 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([src/config.h])
 AM_INIT_AUTOMAKE
 
-
-
 AC_CANONICAL_HOST
 case "$host" in
     *mingw* )
@@ -19,7 +17,6 @@ case "$host" in
 esac
 AM_CONDITIONAL([MINGW32], [test "x$MINGW32" = "xyes"])
 
-
 AC_PROG_RANLIB
 
 dnl Checks for programs.
@@ -45,60 +42,9 @@ AC_C_BIGENDIAN
 AM_ICONV
 AM_CONDITIONAL([USE_ICONV], [test "x$am_cv_func_iconv" = "xyes"])
 
-dnl Audio subsystem
-
-AUDIO_LDFLAGS=""
-
-PKG_CHECK_MODULES(ALSA,
-    [alsa >= 1.0],
-    [AC_DEFINE([HAVE_ALSA], 1, [Define to 1 if you have libasound (-lasound).])],
-    [AC_MSG_WARN([$ALSA_PKG_ERRORS])]
-)
-
-PKG_CHECK_MODULES(PULSE,
-    [libpulse-simple >= 1.0],
-    [AC_DEFINE([HAVE_PULSE], 1, [Define to 1 if you have libpulse-simple (-lpulse-simple).])],
-    [AC_MSG_WARN([$PULSE_PKG_ERRORS])]
-)
-
-
-dnl Checks what version of Unix we have and soundcard support
-AC_CHECK_HEADERS([sys/ioctl.h linux/soundcard.h machine/soundcard.h sys/soundcard.h soundcard.h])
-
-AC_CHECK_HEADERS([dsound.h mmsystem.h], [], [], [#include <windows.h>])
-
-AS_IF([test "$ac_cv_header_dsound_h" = "yes"],
-    [AUDIO_LDFLAGS="$AUDIO_LDFLAGS -ldsound -ldxguid"]
-)
-
-AS_IF([test "$ac_cv_header_mmsystem_h" = "yes"],
-    [AUDIO_LDFLAGS="$AUDIO_LDFLAGS -lwinmm"]
-)
-
-# NetBSD/OpenBSD OSS audio emulation
-AS_IF([test "x$ac_cv_header_soundcard_h" = "xyes"],
-    [AUDIO_LDFLAGS="$AUDIO_LDFLAGS -lossaudio"]
-)
-
-AC_SUBST(AUDIO_LDFLAGS)
-
 PKG_CHECK_MODULES(SIDPLAYFP, [libsidplayfp >= 2.0])
 PKG_CHECK_MODULES(STILVIEW, [libstilview >= 1.0])
 
-USE_LIBOUT123=no
-AC_ARG_WITH([out123], AS_HELP_STRING([--with-out123], [Build with out123 library (default: enabled)]))
-
-AS_IF([test "x$with_out123" != "xno"],
-    [PKG_CHECK_MODULES([OUT123],
-        [libout123 >= 1.0],
-        [USE_LIBOUT123=yes
-        AC_DEFINE([HAVE_OUT123], [1], [Use libout123])],
-        [USE_LIBOUT123=no]
-    )]
-)
-
-AM_CONDITIONAL([USE_LIBOUT123], [test "x$USE_LIBOUT123" = "xyes"])
-
 # check for builders
 PKG_CHECK_VAR([SIDPLAYPF_INCLUDE], [libsidplayfp], [includedir])
 

libs/miniaudio/LICENSE

@@ -0,0 +1,47 @@
+This software is available as a choice of the following licenses. Choose
+whichever you prefer.
+
+===============================================================================
+ALTERNATIVE 1 - Public Domain (www.unlicense.org)
+===============================================================================
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org/>
+
+===============================================================================
+ALTERNATIVE 2 - MIT No Attribution
+===============================================================================
+Copyright 2025 David Reid
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.