aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sfx/mixer.h
diff options
context:
space:
mode:
authorMax Horn2009-03-04 07:38:49 +0000
committerMax Horn2009-03-04 07:38:49 +0000
commitac2d012ae5ee9b7d7431432f2ce312d9f0b8e391 (patch)
tree3ec98103da26c0fcc09fc03e09405e9a8b72ca37 /engines/sci/sfx/mixer.h
parente783859d5c58546b05649c1eb92c6bdbf66b5bb2 (diff)
downloadscummvm-rg350-ac2d012ae5ee9b7d7431432f2ce312d9f0b8e391.tar.gz
scummvm-rg350-ac2d012ae5ee9b7d7431432f2ce312d9f0b8e391.tar.bz2
scummvm-rg350-ac2d012ae5ee9b7d7431432f2ce312d9f0b8e391.zip
SCI: Merged sfx/mixer.cpp into sfx/player/polled.cpp
svn-id: r39116
Diffstat (limited to 'engines/sci/sfx/mixer.h')
-rw-r--r--engines/sci/sfx/mixer.h41
1 files changed, 0 insertions, 41 deletions
diff --git a/engines/sci/sfx/mixer.h b/engines/sci/sfx/mixer.h
deleted file mode 100644
index 955a29289f..0000000000
--- a/engines/sci/sfx/mixer.h
+++ /dev/null
@@ -1,41 +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$
- *
- */
-
-#ifndef SCI_SFX_MIXER_H
-#define SCI_SFX_MIXER_H
-
-#include "sci/sfx/sfx_pcm.h"
-
-namespace Sci {
-
-/**
- * Subscribes the mixer to a new feed.
- * @param feed The feed to subscribe to
- */
-void mixer_subscribe(sfx_pcm_feed_t *feed);
-
-} // End of namespace Sci
-
-#endif // SCI_SFX_MIXER_H