aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2004-11-28 23:24:32 +0000
committerMax Horn2004-11-28 23:24:32 +0000
commitd6d3e5422b1abfb4ebf147b39881ff08ca5289a0 (patch)
tree4543d8ca4fc7675e292497c859d87fee1a3e83b1
parent5a0c72cf88a1d4bfeeb02823d4bef3c22beda9b5 (diff)
downloadscummvm-rg350-d6d3e5422b1abfb4ebf147b39881ff08ca5289a0.tar.gz
scummvm-rg350-d6d3e5422b1abfb4ebf147b39881ff08ca5289a0.tar.bz2
scummvm-rg350-d6d3e5422b1abfb4ebf147b39881ff08ca5289a0.zip
cleanup
svn-id: r15955
-rw-r--r--sound/mixer.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/mixer.h b/sound/mixer.h
index 2f9d5713a3..b70c3b8692 100644
--- a/sound/mixer.h
+++ b/sound/mixer.h
@@ -46,12 +46,6 @@ public:
class SoundMixer {
public:
- typedef void PremixProc (void *param, int16 *data, uint len);
-
- enum {
- NUM_CHANNELS = 16
- };
-
enum {
/** unsigned samples (default: signed) */
FLAG_UNSIGNED = 1 << 0,
@@ -76,6 +70,10 @@ public:
};
private:
+ enum {
+ NUM_CHANNELS = 16
+ };
+
OSystem *_syst;
OSystem::MutexRef _mutex;