diff options
author | Filippos Karapetis | 2009-02-20 00:31:22 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-02-20 00:31:22 +0000 |
commit | 45d3382c9ad76395ca352e983396a0c1b6a6f7d4 (patch) | |
tree | a1fa1d9f6dd45e2cc6c0e076e605335b8b489427 /engines/sci/sfx/mixer | |
parent | 034f63f0950e18d231a9a971741e0c966d980522 (diff) | |
download | scummvm-rg350-45d3382c9ad76395ca352e983396a0c1b6a6f7d4.tar.gz scummvm-rg350-45d3382c9ad76395ca352e983396a0c1b6a6f7d4.tar.bz2 scummvm-rg350-45d3382c9ad76395ca352e983396a0c1b6a6f7d4.zip |
We only got 1 mixer - removed the unneeded file mixers.cpp
svn-id: r38569
Diffstat (limited to 'engines/sci/sfx/mixer')
-rw-r--r-- | engines/sci/sfx/mixer/mixers.cpp | 45 | ||||
-rw-r--r-- | engines/sci/sfx/mixer/soft.cpp | 2 |
2 files changed, 2 insertions, 45 deletions
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 |