diff options
author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
---|---|---|
committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
tree | 40d464262da107ab5eed82f198685209161ebac1 /engines/kyra/sound.h | |
parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/kyra/sound.h')
-rw-r--r-- | engines/kyra/sound.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h index f3de56520e..63cec48d00 100644 --- a/engines/kyra/sound.h +++ b/engines/kyra/sound.h @@ -128,7 +128,7 @@ public: * * @param track sound effect id */ - virtual void playSoundEffect(uint8 track) = 0; + virtual void playSoundEffect(uint8 track, uint8 volume = 0xff) = 0; /** * Stop playback of all sfx tracks. @@ -217,6 +217,16 @@ public: * Stops playback of the current voice. */ void voiceStop(const Audio::SoundHandle *handle = 0); + + /** + * Receive notifications from a song at certain points. + */ + virtual int checkTrigger() { return 0; } + + /** + * Reset sound trigger. + */ + virtual void resetTrigger() {} protected: const char *fileListEntry(int file) const { return (_soundDataList != 0 && file >= 0 && file < _soundDataList->fileListLen) ? _soundDataList->fileList[file] : ""; } int fileListLen() const { return _soundDataList->fileListLen; } @@ -273,7 +283,7 @@ public: virtual void haltTrack(); virtual bool isPlaying() const; - virtual void playSoundEffect(uint8 track); + virtual void playSoundEffect(uint8 track, uint8 volume = 0xff); virtual void stopAllSoundEffects(); |