From b4e70422a3455e327433a7471c929ef100ef3b10 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Sat, 8 Aug 2020 21:56:15 -0400
Subject: mikmod:  Upgrade mikmod core from v3.2.0 to v3.3.11

 * Get rid of the non-functional GT2 loader
 * Add the UMX loader
 * Add HQ mixer routines (and make it configurable)
 * Allow samplerate to be configured at run/playtime
 * Support >64KHz mixing/playback
 * Correctly restore non-boost status

(The diff to upstream is much smaller now too!)

Change-Id: Iaa4ac901ba9cd4123bb225656976e78271353a72
---
 apps/plugins/mikmod/mdreg.c | 66 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 50 insertions(+), 16 deletions(-)

(limited to 'apps/plugins/mikmod/mdreg.c')

diff --git a/apps/plugins/mikmod/mdreg.c b/apps/plugins/mikmod/mdreg.c
index 6cbaad2932..ff5d803000 100644
--- a/apps/plugins/mikmod/mdreg.c
+++ b/apps/plugins/mikmod/mdreg.c
@@ -6,12 +6,12 @@
 	it under the terms of the GNU Library General Public License as
 	published by the Free Software Foundation; either version 2 of
 	the License, or (at your option) any later version.
- 
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Library General Public License for more details.
- 
+
 	You should have received a copy of the GNU Library General Public
 	License along with this library; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -20,8 +20,6 @@
 
 /*==============================================================================
 
-  $Id: mdreg.c,v 1.2 2005/03/30 19:11:13 realtech Exp $
-
   Routine for registering all drivers in libmikmod for the current platform.
 
 ==============================================================================*/
@@ -34,12 +32,13 @@
 
 static void _mm_registeralldrivers(void)
 {
-#if 0
-
 	/* Register network drivers */
 #ifdef DRV_AF
 	_mm_registerdriver(&drv_AF);
 #endif
+#ifdef DRV_PULSEAUDIO
+	_mm_registerdriver(&drv_pulseaudio);
+#endif
 #ifdef DRV_ESD
 	_mm_registerdriver(&drv_esd);
 #endif
@@ -51,8 +50,22 @@ static void _mm_registeralldrivers(void)
 #ifdef DRV_ULTRA
 	_mm_registerdriver(&drv_ultra);
 #endif
+#ifdef DRV_SAM9407
+	_mm_registerdriver(&drv_sam9407);
+#endif
 
-	/* Register hardware drivers - software mixing */
+	/* Register multi-platform drivers -- software mixing */
+#ifdef DRV_SDL
+	_mm_registerdriver(&drv_sdl);
+#endif
+#ifdef DRV_OPENAL
+	_mm_registerdriver(&drv_openal);
+#endif
+
+	/* Register OS-specific hardware drivers - software mixing */
+#ifdef DRV_AHI
+	_mm_registerdriver(&drv_ahi);
+#endif
 #ifdef DRV_AIX
 	_mm_registerdriver(&drv_aix);
 #endif
@@ -62,6 +75,9 @@ static void _mm_registeralldrivers(void)
 #ifdef DRV_HP
 	_mm_registerdriver(&drv_hp);
 #endif
+#ifdef DRV_SNDIO
+	_mm_registerdriver(&drv_sndio);
+#endif
 #ifdef DRV_OSS
 	_mm_registerdriver(&drv_oss);
 #endif
@@ -77,6 +93,9 @@ static void _mm_registeralldrivers(void)
 #ifdef DRV_OS2
 	_mm_registerdriver(&drv_os2);
 #endif
+#ifdef DRV_XAUDIO2
+	_mm_registerdriver(&drv_xaudio2);
+#endif
 #ifdef DRV_DS
 	_mm_registerdriver(&drv_ds);
 #endif
@@ -89,39 +108,54 @@ static void _mm_registeralldrivers(void)
 #ifdef DRV_OSX
 	_mm_registerdriver(&drv_osx);
 #endif
+#ifdef DRV_DC
+	_mm_registerdriver(&drv_dc);
+#endif
 #ifdef DRV_GP32
 	_mm_registerdriver(&drv_gp32);
 #endif
-	
-	/* dos drivers */
+#ifdef DRV_PSP
+	_mm_registerdriver(&drv_psp);
+#endif
+#ifdef DRV_OSLES
+	_mm_registerdriver(&drv_osles);
+#endif
+#ifdef DRV_N64
+	_mm_registerdriver(&drv_n64);
+#endif
+
+	/* dos drivers - wss first, since some cards emulate sb */
 #ifdef DRV_WSS
-	/* wss first, since some cards emulate sb */
 	_mm_registerdriver(&drv_wss);
 #endif
 #ifdef DRV_SB
 	_mm_registerdriver(&drv_sb);
 #endif
-	
+
 	/* Register disk writers */
-	_mm_registerdriver(&drv_raw);
+#ifdef DRV_WAV
 	_mm_registerdriver(&drv_wav);
+#endif
 #ifdef DRV_AIFF
 	_mm_registerdriver(&drv_aiff);
 #endif
-	
+#ifdef DRV_RAW
+	_mm_registerdriver(&drv_raw);
+#endif
+
 	/* Register other drivers */
 #ifdef DRV_PIPE
 	_mm_registerdriver(&drv_pipe);
 #endif
-#ifndef macintosh
+#if defined(DRV_STDOUT) && !defined(macintosh)
 	_mm_registerdriver(&drv_stdout);
 #endif
 
-#endif
+	/* Register 'nosound' driver */
 	_mm_registerdriver(&drv_nos);
 }
 
-void MikMod_RegisterAllDrivers(void)
+MIKMODAPI void MikMod_RegisterAllDrivers(void)
 {
 	MUTEX_LOCK(lists);
 	_mm_registeralldrivers();
-- 
cgit v1.2.3