diff options
Diffstat (limited to 'engines/mohawk/sound.h')
| -rw-r--r-- | engines/mohawk/sound.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/mohawk/sound.h b/engines/mohawk/sound.h index 0e3ecd3c51..f493130d35 100644 --- a/engines/mohawk/sound.h +++ b/engines/mohawk/sound.h @@ -115,28 +115,29 @@ class MohawkEngine; class Sound { public: - Sound(MohawkEngine*); + Sound(MohawkEngine *vm); ~Sound(); - void loadRivenSounds(uint16 stack); - Audio::SoundHandle *playSound(uint16 id, bool mainSoundFile = true, byte volume = Audio::Mixer::kMaxChannelVolume, bool loop = false); + Audio::SoundHandle *playSound(uint16 id, byte volume = Audio::Mixer::kMaxChannelVolume, bool loop = false); + void playSoundBlocking(uint16 id, byte volume = Audio::Mixer::kMaxChannelVolume); void playMidi(uint16 id); void stopSound(); void pauseSound(); void resumeSound(); + + // Riven-specific void playSLST(uint16 index, uint16 card); void playSLST(SLSTRecord slstRecord); void pauseSLST(); void resumeSLST(); void stopAllSLST(); + static byte convertRivenVolume(uint16 volume); private: MohawkEngine *_vm; - MohawkArchive *_rivenSoundFile; MidiDriver *_midiDriver; MidiParser *_midiParser; - static Audio::AudioStream *getCSAmtrakMusic(uint16 id); static Audio::AudioStream *makeMohawkWaveStream(Common::SeekableReadStream *stream); static Audio::AudioStream *makeOldMohawkWaveStream(Common::SeekableReadStream *stream); void initMidi(); @@ -144,7 +145,7 @@ private: Common::Array<SndHandle> _handles; SndHandle *getHandle(); - // Riven specific + // Riven-specific void playSLSTSound(uint16 index, bool fade, bool loop, uint16 volume, int16 balance); void stopSLSTSound(uint16 id, bool fade); Common::Array<SLSTSndHandle> _currentSLSTSounds; |