X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fmusic.c;h=fe8ed6d940786a8565bfd98077d9f1bb30d768cc;hp=365ad01d1c26a6a42fc5dbc941f62398aff59e16;hb=93f68e445b0a4f10f2b15383aafed8a216a4a228;hpb=a714b8c4811627d874934b0a0387b8cb27fc5921

diff --git a/src/music.c b/src/music.c
index 365ad01..fe8ed6d 100644
--- a/src/music.c
+++ b/src/music.c
@@ -1,21 +1,28 @@
+#include <stdlib.h>
 #include "music.h"
+
+#ifdef __WATCOMC__
+#define NO_MUSIC
+#endif
+
+#ifndef NO_MUSIC
 #include "mikmod.h"
 
 static MODULE *mod;
 static int initialized;
 
-
 static int init(void)
 {
 	MikMod_RegisterAllDrivers();
 	MikMod_RegisterAllLoaders();
 
-	md_mode |= DMODE_SOFT_MUSIC;
+	md_mode |= DMODE_SOFT_MUSIC | DMODE_16BITS | DMODE_STEREO | DMODE_INTERP;
 	if(MikMod_Init("") != 0) {
 		fprintf(stderr, "mikmod init failed: %s\n",
 				MikMod_strerror(MikMod_errno));
 		return -1;
 	}
+
 	return 0;
 }
 
@@ -39,8 +46,10 @@ int music_open(const char *fname)
 void music_close(void)
 {
 	if(mod) {
+		printf("shutting down music playback\n");
 		music_stop();
 		Player_Free(mod);
+		mod = 0;
 	}
 }
 
@@ -60,3 +69,28 @@ void music_update(void)
 		MikMod_Update();
 	}
 }
+
+#else	/* NO_MUSIC */
+
+int music_open(const char *fname)
+{
+	return 0;
+}
+
+void music_close(void)
+{
+}
+
+void music_play(void)
+{
+}
+
+void music_stop(void)
+{
+}
+
+void music_update(void)
+{
+}
+
+#endif