From 866fe8e387217f6c42ebc6bec157016fd43fbbe1 Mon Sep 17 00:00:00 2001
From: kreatordxx <>
Date: Tue, 9 Mar 2010 03:08:00 +0000
Subject: [PATCH] Change audio buffer size back to 1024 for Mac only - fixing
 crackly music

---
 CHANGELOG.txt         | 1 +
 arch/sdl/digi_audio.c | 4 ++++
 arch/sdl/digi_mixer.c | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 62b6d3654..5c545ad80 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D2X-Rebirth Changelog
 20100309
 --------
 main/titles.c: Put briefing globals in 'briefing' struct, pass this by parameter
+arch/sdl/digi_audio.c, arch/sdl/digi_mixer.c: Change audio buffer size back to 1024 for Mac only - fixing crackly music
 
 20100303
 --------
diff --git a/arch/sdl/digi_audio.c b/arch/sdl/digi_audio.c
index e877637a8..be56b84d0 100644
--- a/arch/sdl/digi_audio.c
+++ b/arch/sdl/digi_audio.c
@@ -50,7 +50,11 @@ extern inline fix fixmul(fix x, fix y) { return do_fixmul(x,y); }
 //changed on 980905 by adb to increase number of concurrent sounds
 #define MAX_SOUND_SLOTS 32
 //end changes by adb
+#if !((defined(__APPLE__) && defined(__MACH__)) || defined(macintosh))
 #define SOUND_BUFFER_SIZE 2048
+#else
+#define SOUND_BUFFER_SIZE 1024
+#endif
 
 #define MIN_VOLUME 10
 
diff --git a/arch/sdl/digi_mixer.c b/arch/sdl/digi_mixer.c
index fcf9a379b..052cd8572 100644
--- a/arch/sdl/digi_mixer.c
+++ b/arch/sdl/digi_mixer.c
@@ -55,7 +55,11 @@ extern inline fix fixmul(fix x, fix y) { return do_fixmul(x,y); }
 //end edit -MM
 
 #define MAX_SOUND_SLOTS 64
+#if !((defined(__APPLE__) && defined(__MACH__)) || defined(macintosh))
 #define SOUND_BUFFER_SIZE 2048
+#else
+#define SOUND_BUFFER_SIZE 1024
+#endif
 #define MIN_VOLUME 10
 
 static int digi_initialised = 0;