From 502ff6a666729f7b854e9c406030af24bb16d55c Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Tue, 26 Dec 2006 15:43:16 +0000 Subject: 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 --- setup/sound.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'setup') 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 +#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; -- cgit v1.2.3