aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/sound.h
diff options
context:
space:
mode:
authorMax Horn2006-10-21 12:44:10 +0000
committerMax Horn2006-10-21 12:44:10 +0000
commit9edf1e6a1a95f45b9883e298edc7e578ff9495d1 (patch)
tree897a46c0e4bbc22c8422bd3b96545bfeea3a4a0f /engines/scumm/sound.h
parent86d3f30347d5ee7ee67a4f16d5043b9bef0539db (diff)
downloadscummvm-rg350-9edf1e6a1a95f45b9883e298edc7e578ff9495d1.tar.gz
scummvm-rg350-9edf1e6a1a95f45b9883e298edc7e578ff9495d1.tar.bz2
scummvm-rg350-9edf1e6a1a95f45b9883e298edc7e578ff9495d1.zip
cleanup
svn-id: r24407
Diffstat (limited to 'engines/scumm/sound.h')
-rw-r--r--engines/scumm/sound.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/scumm/sound.h b/engines/scumm/sound.h
index 83607d3dd3..bda4fdd273 100644
--- a/engines/scumm/sound.h
+++ b/engines/scumm/sound.h
@@ -27,6 +27,10 @@
#include "sound/mixer.h"
#include "scumm/saveload.h"
+namespace Audio {
+class Mixer;
+}
+
namespace Scumm {
class ScummEngine;
@@ -52,6 +56,7 @@ public:
protected:
ScummEngine *_vm;
+ Audio::Mixer *_mixer;
int16 _soundQuePos, _soundQue[0x100];
int16 _soundQue2Pos;
@@ -85,7 +90,7 @@ public:
byte _sfxMode;
public:
- Sound(ScummEngine *parent);
+ Sound(ScummEngine *parent, Audio::Mixer *mixer);
virtual ~Sound();
virtual void addSoundToQueue(int sound, int heOffset = 0, int heChannel = 0, int heFlags = 0);
virtual void addSoundToQueue2(int sound, int heOffset = 0, int heChannel = 0, int heFlags = 0);