diff options
author | David Eriksson | 2003-10-23 06:44:35 +0000 |
---|---|---|
committer | David Eriksson | 2003-10-23 06:44:35 +0000 |
commit | ad98347eb0f17cf9ff2b72b86589866943ef28dd (patch) | |
tree | 53bbb70d19c3c2163483db83e1797570dec03765 /queen/sound.h | |
parent | 3ccd6704bdc4a6fad19d2fb68a75c089dc4f60ca (diff) | |
download | scummvm-rg350-ad98347eb0f17cf9ff2b72b86589866943ef28dd.tar.gz scummvm-rg350-ad98347eb0f17cf9ff2b72b86589866943ef28dd.tar.bz2 scummvm-rg350-ad98347eb0f17cf9ff2b72b86589866943ef28dd.zip |
Initial version of the Input class. Some things still missing.
svn-id: r10944
Diffstat (limited to 'queen/sound.h')
-rw-r--r-- | queen/sound.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/queen/sound.h b/queen/sound.h index c64443cf99..f6a4cb164e 100644 --- a/queen/sound.h +++ b/queen/sound.h @@ -28,18 +28,20 @@ namespace Queen { +class Input; class Resource; class Sound { public: - Sound(SoundMixer *mixer, Resource *resource); + Sound(SoundMixer *mixer, Input *input, Resource *resource); virtual ~Sound(); virtual void sfxPlay(const char *base) = 0; - static Sound *giveSound(SoundMixer *mixer, Resource *resource, uint8 compression); + static Sound *giveSound(SoundMixer *mixer, Input *input, Resource *resource, uint8 compression); bool isPlaying(); protected: SoundMixer *_mixer; + Input *_input; Resource *_resource; PlayingSoundHandle _sfxHandle; @@ -47,13 +49,13 @@ protected: class SilentSound : public Sound { public: - SilentSound(SoundMixer *mixer, Resource *resource) : Sound(mixer, resource) {}; + SilentSound(SoundMixer *mixer, Input *input, Resource *resource) : Sound(mixer, input, resource) {}; void sfxPlay(const char *base) { } }; class SBSound : public Sound { public: - SBSound(SoundMixer *mixer, Resource *resource) : Sound(mixer, resource) {}; + SBSound(SoundMixer *mixer, Input *input, Resource *resource) : Sound(mixer, input, resource) {}; int playSound(byte *sound, uint32 size); void sfxPlay(const char *base); }; @@ -61,7 +63,7 @@ public: #ifdef USE_MAD class MP3Sound : public Sound { public: - MP3Sound(SoundMixer *mixer, Resource *resource) : Sound(mixer, resource) {}; + MP3Sound(SoundMixer *mixer, Input *input, Resource *resource) : Sound(mixer, input, resource) {}; void sfxPlay(const char *base); }; #endif |