3 files changed, 15 insertions, 14 deletions
diff --git a/backends/mixer/macosx/macosx-mixer.cpp b/backends/mixer/bufferingsdl/bufferingsdl-mixer.cpp
index d3f960792a..1eef3e5397 100644
--- a/backends/mixer/macosx/macosx-mixer.cpp
+++ b/backends/mixer/bufferingsdl/bufferingsdl-mixer.cpp
@@ -25,20 +25,20 @@
 
 #if defined(MACOSX)
 
-#include "backends/mixer/macosx/macosx-mixer.h"
+#include "backends/mixer/bufferingsdl/bufferingsdl-mixer.h"
 
-MacOSXMixerManager::MacOSXMixerManager()
+BufferingSDLMixerManager::BufferingSDLMixerManager()
 	:
 	_soundMutex(0), _soundCond(0), _soundThread(0),
 	_soundThreadIsRunning(false), _soundThreadShouldQuit(false) {
 	
 }
 
-MacOSXMixerManager::~MacOSXMixerManager() {
+BufferingSDLMixerManager::~BufferingSDLMixerManager() {
 	deinitThreadedMixer();
 }
 
-void MacOSXMixerManager::startAudio() {
+void BufferingSDLMixerManager::startAudio() {
 	_soundThreadIsRunning = false;
 	_soundThreadShouldQuit = false;
 
@@ -61,7 +61,7 @@ void MacOSXMixerManager::startAudio() {
 	SdlMixerManager::startAudio();
 }
 
-void MacOSXMixerManager::mixerProducerThread() {
+void BufferingSDLMixerManager::mixerProducerThread() {
 	byte nextSoundBuffer;
 
 	SDL_LockMutex(_soundMutex);
@@ -82,14 +82,14 @@ void MacOSXMixerManager::mixerProducerThread() {
 	SDL_UnlockMutex(_soundMutex);
 }
 
-int SDLCALL MacOSXMixerManager::mixerProducerThreadEntry(void *arg) {
-	MacOSXMixerManager *mixer = (MacOSXMixerManager *)arg;
+int SDLCALL BufferingSDLMixerManager::mixerProducerThreadEntry(void *arg) {
+	BufferingSDLMixerManager *mixer = (BufferingSDLMixerManager *)arg;
 	assert(mixer);
 	mixer->mixerProducerThread();
 	return 0;
 }
 
-void MacOSXMixerManager::deinitThreadedMixer() {
+void BufferingSDLMixerManager::deinitThreadedMixer() {
 	// Kill thread?? _soundThread
 
 	if (_soundThreadIsRunning) {
@@ -112,7 +112,7 @@ void MacOSXMixerManager::deinitThreadedMixer() {
 }
 
 
-void MacOSXMixerManager::callbackHandler(byte *samples, int len) {
+void BufferingSDLMixerManager::callbackHandler(byte *samples, int len) {
 	assert(_mixer);
 	assert((int)_soundBufSize == len);
 
diff --git a/backends/mixer/macosx/macosx-mixer.h b/backends/mixer/bufferingsdl/bufferingsdl-mixer.h
index aa8f800495..bcf562a295 100644
--- a/backends/mixer/macosx/macosx-mixer.h
+++ b/backends/mixer/bufferingsdl/bufferingsdl-mixer.h
@@ -23,15 +23,15 @@
  *
  */
 
-#ifndef BACKENDS_MIXER_MACOSX_H
-#define BACKENDS_MIXER_MACOSX_H
+#ifndef BACKENDS_MIXER_BUFFERINGSDL_H
+#define BACKENDS_MIXER_BUFFERINGSDL_H
 
 #include "backends/mixer/sdl/sdl-mixer.h"
 
-class MacOSXMixerManager : public SdlMixerManager {
+class BufferingSDLMixerManager : public SdlMixerManager {
 public:
-	MacOSXMixerManager();
-	~MacOSXMixerManager();
+	BufferingSDLMixerManager();
+	~BufferingSDLMixerManager();
 
 protected:
 	SDL_mutex *_soundMutex;
diff --git a/backends/module.mk b/backends/module.mk
index da96bfed00..ae82580cbb 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -35,6 +35,7 @@ MODULE_OBJS := \
 	midi/timidity.o \
 	midi/dmedia.o \
 	midi/windows.o \
+	mixer/bufferingsdl/bufferingsdl-mixer.o \
 	mixer/sdl/sdl-mixer.o \
 	mutex/sdl/sdl-mutex.o \
 	plugins/dc/dc-provider.o \