diff options
author | Bastien Bouclet | 2016-08-08 07:35:55 +0200 |
---|---|---|
committer | Bastien Bouclet | 2016-08-11 19:53:20 +0200 |
commit | 2756d6226b1567dbe650284c56d93d722af906b2 (patch) | |
tree | c08237d5dd570950dff2e087d6f592183570848a /engines/mohawk/sound.h | |
parent | aeee4888beb8ba15a32a438e4ac82c53d250e039 (diff) | |
download | scummvm-rg350-2756d6226b1567dbe650284c56d93d722af906b2.tar.gz scummvm-rg350-2756d6226b1567dbe650284c56d93d722af906b2.tar.bz2 scummvm-rg350-2756d6226b1567dbe650284c56d93d722af906b2.zip |
MOHAWK: Add a Riven specific sound manager
- Add ambient sound fading
- Fix ambient sound volume to use the list-level volume
Diffstat (limited to 'engines/mohawk/sound.h')
-rw-r--r-- | engines/mohawk/sound.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/engines/mohawk/sound.h b/engines/mohawk/sound.h index 6b50c411c2..2b4b1ce091 100644 --- a/engines/mohawk/sound.h +++ b/engines/mohawk/sound.h @@ -42,20 +42,6 @@ namespace Mohawk { #define MAX_CHANNELS 2 // Can there be more than 2? -struct SLSTRecord { - uint16 index; - uint16 sound_count; - uint16 *sound_ids; - uint16 fade_flags; - uint16 loop; - uint16 global_volume; - uint16 u0; - uint16 u1; - uint16 *volumes; - int16 *balances; - uint16 *u2; -}; - enum SndHandleType { kFreeHandle, kUsedHandle @@ -68,11 +54,6 @@ struct SndHandle { uint16 id; }; -struct SLSTSndHandle { - Audio::SoundHandle *handle; - uint16 id; -}; - struct ADPCMStatus { // Holds ADPCM status data, but is irrelevant for us. uint32 size; uint16 itemCount; @@ -144,12 +125,6 @@ public: void stopBackgroundMyst(); void changeBackgroundVolumeMyst(uint16 vol); - // Riven-specific sound functions - void playSLST(uint16 index, uint16 card); - void playSLST(SLSTRecord slstRecord); - void stopAllSLST(bool fade = false); - static byte convertRivenVolume(uint16 volume); - private: MohawkEngine *_vm; MidiDriver *_midiDriver; @@ -166,11 +141,6 @@ private: // Myst-specific SndHandle _mystBackgroundSound; - - // Riven-specific - void playSLSTSound(uint16 index, bool fade, bool loop, uint16 volume, int16 balance); - void stopSLSTSound(uint16 id, bool fade); - Common::Array<SLSTSndHandle> _currentSLSTSounds; }; } // End of namespace Mohawk |