4 files changed, 5 insertions, 46 deletions
diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp
index 23d5f19cd1..70eb8d215d 100644
--- a/engines/sci/sfx/core.cpp
+++ b/engines/sci/sfx/core.cpp
@@ -445,7 +445,7 @@ sfx_init(sfx_state_t *self, resource_mgr_t *resmgr, int flags) {
 		return;
 	}
 
-	mixer = sfx_pcm_find_mixer(NULL);
+	mixer = getMixer();
 	pcm_device = &sfx_pcm_driver_scummvm;
 	player = sfx_find_player(NULL);
 
diff --git a/engines/sci/sfx/mixer.h b/engines/sci/sfx/mixer.h
index 2dbff557bc..70aad8d483 100644
--- a/engines/sci/sfx/mixer.h
+++ b/engines/sci/sfx/mixer.h
@@ -122,4 +122,6 @@ sfx_pcm_find_mixer(char *name);
 
 extern sfx_pcm_mixer_t *mixer; /* _THE_ global pcm mixer */
 
+sfx_pcm_mixer_t* getMixer();
+
 #endif /* !defined(_SFX_MIXER_H_) */
diff --git a/engines/sci/sfx/mixer/mixers.cpp b/engines/sci/sfx/mixer/mixers.cpp
deleted file mode 100644
index 235e11930f..0000000000
--- a/engines/sci/sfx/mixer/mixers.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "../mixer.h"
-#include "sci/include/resource.h"
-
-extern sfx_pcm_mixer_t sfx_pcm_mixer_soft_linear;
-
-static sfx_pcm_mixer_t *mixers[] = {
-	&sfx_pcm_mixer_soft_linear,
-	NULL
-};
-
-sfx_pcm_mixer_t *
-sfx_pcm_find_mixer(char *name) {
-	int i = 0;
-
-	if (name)
-		while (mixers[i] && strcmp(name, mixers[i]->name))
-			++i;
-
-	return mixers[i];
-}
diff --git a/engines/sci/sfx/mixer/soft.cpp b/engines/sci/sfx/mixer/soft.cpp
index 00897c38af..093a57e3e9 100644
--- a/engines/sci/sfx/mixer/soft.cpp
+++ b/engines/sci/sfx/mixer/soft.cpp
@@ -968,3 +968,5 @@ sfx_pcm_mixer_t sfx_pcm_mixer_soft_linear = {
 	NULL,
 	NULL
 };
+
+sfx_pcm_mixer_t* getMixer() { return &sfx_pcm_mixer_soft_linear; }
+\ No newline at end of file