diff options
author | uruk | 2014-05-24 10:47:07 +0200 |
---|---|---|
committer | uruk | 2014-05-24 10:47:07 +0200 |
commit | 3c86aa288b532ddf9370fdcf33f144b43ffab5cc (patch) | |
tree | 6b73bfa08858187439b70b923fdacae4c30e05c0 /engines/cge2/sound.h | |
parent | 4cf5c28fee6d71277a7ca2bea5663aa12e387a68 (diff) | |
download | scummvm-rg350-3c86aa288b532ddf9370fdcf33f144b43ffab5cc.tar.gz scummvm-rg350-3c86aa288b532ddf9370fdcf33f144b43ffab5cc.tar.bz2 scummvm-rg350-3c86aa288b532ddf9370fdcf33f144b43ffab5cc.zip |
CGE2: Implement snSound().
Rework the whole Fx class during the process.
The intro animation is working now.
Diffstat (limited to 'engines/cge2/sound.h')
-rw-r--r-- | engines/cge2/sound.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/engines/cge2/sound.h b/engines/cge2/sound.h index c488c3fbba..6fa2b2a553 100644 --- a/engines/cge2/sound.h +++ b/engines/cge2/sound.h @@ -72,7 +72,7 @@ public: ~Sound(); void open(); void close(); - void play(DataCk *wav, int pan); + void play(DataCk *wav, int pan = 8); int16 getRepeat(); void setRepeat(int16 count); void stop(); @@ -88,23 +88,18 @@ private: class Fx { CGE2Engine *_vm; - struct Handler { - int _ref; - DataCk *_wav; - } *_cache; int _size; - DataCk *load(int idx, int ref); DataCk *loadWave(EncryptedStream *file); - int find(int ref); + Common::String name(int ref, int sub); public: DataCk *_current; Fx(CGE2Engine *vm, int size); ~Fx(); void clear(); - void name(int ref, int sub); - DataCk *operator[](int ref); + bool exist(int ref, int sub = 0); + DataCk *load(int ref, int sub = 0); }; class MusicPlayer: public Audio::MidiPlayer { |