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
---
 src/i_sound.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'src/i_sound.c')

diff --git a/src/i_sound.c b/src/i_sound.c
index bdb82c53..ec3a68ad 100644
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "SDL.h"
-#include <SDL_mixer.h>
+#include "SDL_mixer.h"
 
 #ifndef _WIN32
 #include <unistd.h>
@@ -78,7 +78,15 @@ static boolean music_initialised = false;
 static Mix_Chunk sound_chunks[NUMSFX];
 static int channels_playing[NUM_CHANNELS];
 
-int snd_musicdevice = SNDDEVICE_SB;
+// Disable music on OSX by default; there are problems with SDL_mixer.
+
+#ifndef __MACOSX__
+#define DEFAULT_MUSIC_DEVICE SNDDEVICE_SB
+#else
+#define DEFAULT_MUSIC_DEVICE SNDDEVICE_NONE
+#endif
+
+int snd_musicdevice = DEFAULT_MUSIC_DEVICE;
 int snd_sfxdevice = SNDDEVICE_SB;
 
 // When a sound stops, check if it is still playing.  If it is not, 
@@ -475,6 +483,20 @@ I_InitSound()
         nosfxparm = true;
     }
 
+    // When trying to run with music enabled on OSX, display
+    // a warning message.
+
+#ifdef __MACOSX__
+    if (!nomusicparm)
+    {
+        printf("\n"
+               "                   *** WARNING ***\n"
+               "      Music playback on OSX may cause crashes and\n"
+               "      is disabled by default.\n"
+               "\n");
+    }
+#endif
+
     //!
     // Disable sound effects and music.
     //
-- 
cgit v1.2.3