From 40a3a3b8353924b7bec4237d622e6ddddaf2aef8 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 11 Jun 2015 08:32:31 -0400 Subject: SHERLOCK: RT map display partially working --- engines/sherlock/music.h | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'engines/sherlock/music.h') diff --git a/engines/sherlock/music.h b/engines/sherlock/music.h index 1e2b91a603..04b9dbd98e 100644 --- a/engines/sherlock/music.h +++ b/engines/sherlock/music.h @@ -53,28 +53,24 @@ public: }; class Music { -public: - Music(SherlockEngine *vm, Audio::Mixer *mixer); - ~Music(); - private: SherlockEngine *_vm; Audio::Mixer *_mixer; MidiParser_SH *_midiParser; MidiDriver *_midiDriver; Audio::SoundHandle _digitalMusicHandle; - -public: - bool _musicPlaying; - bool _musicOn; - -private: MusicType _musicType; - byte *_midiMusicData; int32 _midiMusicDataSize; - public: + bool _musicPlaying; + bool _musicOn; + int _musicVolume; + bool _midiOption; +public: + Music(SherlockEngine *vm, Audio::Mixer *mixer); + ~Music(); + /** * Saves sound-related settings */ @@ -118,6 +114,11 @@ public: bool waitUntilTick(uint32 tick, uint32 maxTick, uint32 additionalDelay, uint32 noMusicDelay); bool waitUntilMSec(uint32 msecTarget, uint32 maxMSec, uint32 additionalDelay, uint32 noMusicDelay); + + /** + * Sets the volume of the MIDI music with a value ranging from 0 to 127 + */ + void setMIDIVolume(int volume); }; } // End of namespace Sherlock -- cgit v1.2.3