diff options
| author | Simon Howard | 2006-12-26 15:43:16 +0000 |
|---|---|---|
| committer | Simon Howard | 2006-12-26 15:43:16 +0000 |
| commit | 502ff6a666729f7b854e9c406030af24bb16d55c (patch) | |
| tree | cd351303147fc0fd1f841b76d2a90d5746ede025 /setup/sound.c | |
| parent | caf76f0e421c3b55e973dfc125bc7bff7a6e89db (diff) | |
| download | chocolate-doom-502ff6a666729f7b854e9c406030af24bb16d55c.tar.gz chocolate-doom-502ff6a666729f7b854e9c406030af24bb16d55c.tar.bz2 chocolate-doom-502ff6a666729f7b854e9c406030af24bb16d55c.zip | |
On OSX, make MIDI music disabled by default. There are problems with the
native MIDI code in SDL_mixer.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 811
Diffstat (limited to 'setup/sound.c')
| -rw-r--r-- | setup/sound.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/setup/sound.c b/setup/sound.c index d5a61ac4..10ec823c 100644 --- a/setup/sound.c +++ b/setup/sound.c @@ -23,15 +23,25 @@ #include <stdlib.h> +#include "SDL.h" #include "textscreen.h" #include "sound.h" +// Disable MIDI music on OSX: there are problems with the native +// MIDI code in SDL_mixer. + +#ifdef __MACOSX__ +#define DEFAULT_MUSIC_DEVICE 0 +#else +#define DEFAULT_MUSIC_DEVICE 3 +#endif + int snd_sfxdevice = 3; int numChannels = 8; int sfxVolume = 15; -int snd_musicdevice = 3; +int snd_musicdevice = DEFAULT_MUSIC_DEVICE; int musicVolume = 15; static int snd_sfxenabled; |