projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fixed C89 compliance issues with the last commit (rlebitmap/minifx)
[dosdemo]
/
src
/
glut
/
audio.c
diff --git
a/src/glut/audio.c
b/src/glut/audio.c
index
a7ea50c
..
6a7b96c
100644
(file)
--- a/
src/glut/audio.c
+++ b/
src/glut/audio.c
@@
-9,6
+9,7
@@
#endif
#include "mikmod.h"
#include "audio.h"
#endif
#include "mikmod.h"
#include "audio.h"
+#include "cfgopt.h"
#ifdef _WIN32
#include <windows.h>
#ifdef _WIN32
#include <windows.h>
@@
-37,6
+38,8
@@
int au_init(void)
curmod = 0;
vol_master = vol_mus = vol_sfx = 255;
curmod = 0;
vol_master = vol_mus = vol_sfx = 255;
+ if(!opt.music) return 0;
+
#if defined(__linux__)
MikMod_RegisterDriver(&drv_alsa);
#elif defined(__FreeBSD__)
#if defined(__linux__)
MikMod_RegisterDriver(&drv_alsa);
#elif defined(__FreeBSD__)
@@
-78,8
+81,10
@@
int au_init(void)
void au_shutdown(void)
{
void au_shutdown(void)
{
- curmod = 0;
- MikMod_Exit();
+ if(opt.music) {
+ curmod = 0;
+ MikMod_Exit();
+ }
}
struct au_module *au_load_module(const char *fname)
}
struct au_module *au_load_module(const char *fname)