It turns out that the nosound mikmod driver works perfectly well for …

…our use. :)
libsdl-org · Aug 21, 2005 · d2e9d4b · d2e9d4b
1 parent 9701455
commit d2e9d4b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 94 deletions.
diff --git a/VisualC.zip b/VisualC.zip
diff --git a/mikmod/Makefile.am b/mikmod/Makefile.am
@@ -3,7 +3,6 @@ noinst_LTLIBRARIES = libmikmod.la
 
 libmikmod_la_SOURCES =		\
 	drv_nos.c		\
-	drv_sdl.c		\
 	load_it.c		\
 	load_mod.c		\
 	load_s3m.c		\

diff --git a/mikmod/drv_nos.c b/mikmod/drv_nos.c
@@ -35,6 +35,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#define SDL_MIXER_ONLY
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -44,7 +45,9 @@
 
 #define ZEROLEN 32768
 
+#ifndef SDL_MIXER_ONLY
 static	SBYTE *zerobuf=NULL;
+#endif
 
 static BOOL NS_IsThere(void)
 {
@@ -53,20 +56,26 @@ static BOOL NS_IsThere(void)
 
 static BOOL NS_Init(void)
 {
+#ifndef SDL_MIXER_ONLY
 	zerobuf=(SBYTE*)_mm_malloc(ZEROLEN);
+#endif
 	return VC_Init();
 }
 
 static void NS_Exit(void)
 {
 	VC_Exit();
+#ifndef SDL_MIXER_ONLY
 	_mm_free(zerobuf);
+#endif
 }
 
 static void NS_Update(void)
 {
+#ifndef SDL_MIXER_ONLY
 	if (zerobuf)
 		VC_WriteBytes(zerobuf,ZEROLEN);
+#endif
 }
 
 MIKMODAPI MDRIVER drv_nos={

diff --git a/mikmod/drv_sdl.c b/mikmod/drv_sdl.c
diff --git a/mikmod/mdreg.c b/mikmod/mdreg.c
@@ -32,11 +32,8 @@
 
 #include "mikmod_internals.h"
 
-MIKMODAPI extern struct MDRIVER drv_sdl;    /* Simple Direct Media */
-
 void _mm_registeralldrivers(void)
 {
-	_mm_registerdriver(&drv_sdl);
 	_mm_registerdriver(&drv_nos);
 }
 

diff --git a/mikmod/mikmod.h b/mikmod/mikmod.h
@@ -650,8 +650,6 @@ MIKMODAPI extern struct MDRIVER drv_raw;    /* raw file disk writer [music.raw]
 MIKMODAPI extern struct MDRIVER drv_stdout; /* output to stdout */
 MIKMODAPI extern struct MDRIVER drv_wav;    /* RIFF WAVE file disk writer [music.wav] */
 
-MIKMODAPI extern struct MDRIVER drv_sdl;    /* SDL_mixer driver */
-
 MIKMODAPI extern struct MDRIVER drv_ultra;  /* Linux Ultrasound driver */
 
 MIKMODAPI extern struct MDRIVER drv_AF;     /* Dec Alpha AudioFile */

diff --git a/music.c b/music.c
@@ -380,23 +380,22 @@ int open_music(SDL_AudioSpec *mixer)
 		}
 		md_mode |= DMODE_STEREO;
 	}
-	md_mixfreq	 = mixer->freq;
-	md_device	  = 0;
-	md_volume	  = 96;
+	md_mixfreq = mixer->freq;
+	md_device  = 0;
+	md_volume  = 96;
 	md_musicvolume = 128;
 	md_sndfxvolume = 128;
-	md_pansep	  = 128;
-	md_reverb	  = 0;
-#ifdef LIBMIKMOD_MUSIC
-	md_mode |= DMODE_HQMIXER|DMODE_SOFT_MUSIC|DMODE_SURROUND;
-#endif
+	md_pansep  = 128;
+	md_reverb  = 0;
+	md_mode    |= DMODE_HQMIXER|DMODE_SOFT_MUSIC|DMODE_SURROUND;
 #ifdef LIBMIKMOD_MUSIC
 	list = MikMod_InfoDriver();
 	if ( list )
 	  free(list);
 	else
-#endif
+#else
 	MikMod_RegisterDriver(&drv_nos);
+#endif
 #ifdef LIBMIKMOD_MUSIC
 	list = MikMod_InfoLoader();
 	if ( list )