diff options
| author | Paul Gilbert | 2016-09-17 20:06:43 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-09-17 20:06:43 -0400 |
| commit | 1f541a700595e6ecc600ccf11005f7e62b47504b (patch) | |
| tree | 4c6342b9b09f5eb49b88dd6d73ccabd495d4f28d /engines/xeen/music.h | |
| parent | e981f3bf2e66029a816f80a2f5600cdf2174412d (diff) | |
| download | scummvm-rg350-1f541a700595e6ecc600ccf11005f7e62b47504b.tar.gz scummvm-rg350-1f541a700595e6ecc600ccf11005f7e62b47504b.tar.bz2 scummvm-rg350-1f541a700595e6ecc600ccf11005f7e62b47504b.zip | |
XEEN: Changing file opening specifying archive to use enum
Diffstat (limited to 'engines/xeen/music.h')
| -rw-r--r-- | engines/xeen/music.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/engines/xeen/music.h b/engines/xeen/music.h index 84096945e8..1182be4377 100644 --- a/engines/xeen/music.h +++ b/engines/xeen/music.h @@ -29,6 +29,7 @@ #include "common/mutex.h" #include "common/queue.h" #include "common/stack.h" +#include "xeen/files.h" #define CHANNEL_COUNT 9 @@ -90,7 +91,7 @@ private: bool command(const byte *&srcP); protected: Common::Array<Channel> _channels; - bool _exclude7; + int _exclude7; bool _musicPlaying; bool _fxPlaying; protected: @@ -135,11 +136,6 @@ protected: * Post-processing done when a pause countdown starts or is in progress */ virtual void pausePostProcess() = 0; - - /** - * Does a reset of any sound effect - */ - virtual void resetFX() = 0; public: /** * Constructor @@ -157,6 +153,11 @@ public: virtual void playFX(uint effectId, const byte *data); /** + * Does a reset of any sound effect + */ + virtual void stopFX() = 0; + + /** * Plays a song */ virtual void playSong(const byte *data); @@ -261,11 +262,6 @@ protected: * Post-processing done when a pause countdown starts or is in progress */ virtual void pausePostProcess(); - - /** - * Does a reset of any sound effect - */ - virtual void resetFX(); public: /** * Constructor @@ -283,6 +279,11 @@ public: virtual void playFX(uint effectId, const byte *data); /** + * Does a reset of any sound effect + */ + virtual void stopFX(); + + /** * Plays a song */ virtual void playSong(const byte *data); @@ -299,6 +300,7 @@ private: const byte *_effectsData; Common::Array<uint16> _effectsOffsets; const byte *_songData; + ArchiveType _archiveType; private: /** * Loads effects data that was embedded in the music driver |