aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/sound/base_sound_manager.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/base/sound/base_sound_manager.h')
-rw-r--r--engines/wintermute/base/sound/base_sound_manager.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/wintermute/base/sound/base_sound_manager.h b/engines/wintermute/base/sound/base_sound_manager.h
index 36a729b5ae..602571765f 100644
--- a/engines/wintermute/base/sound/base_sound_manager.h
+++ b/engines/wintermute/base/sound/base_sound_manager.h
@@ -45,13 +45,11 @@ public:
//DECLARE_PERSISTENT(BaseSoundMgr, BaseClass);
byte getMasterVolumePercent();
byte getMasterVolume();
- bool setMasterVolume(byte percent);
bool setMasterVolumePercent(byte percent);
byte getVolumePercent(Audio::Mixer::SoundType type);
bool setVolumePercent(Audio::Mixer::SoundType type, byte percent);
bool setVolume(Audio::Mixer::SoundType type, int volume);
- uint32 _volumeOriginal;
- int _volumeMaster;
+ int32 _volumeMaster;
bool removeSound(BaseSoundBuffer *sound);
BaseSoundBuffer *addSound(const Common::String &filename, Audio::Mixer::SoundType type = Audio::Mixer::kSFXSoundType, bool streamed = false);
bool addSound(BaseSoundBuffer *sound, Audio::Mixer::SoundType type = Audio::Mixer::kSFXSoundType);
@@ -61,6 +59,9 @@ public:
virtual ~BaseSoundMgr();
Common::Array<BaseSoundBuffer *> _sounds;
void saveSettings();
+private:
+ int32 _volumeMasterPercent; // Necessary to avoid round-offs.
+ bool setMasterVolume(byte percent);
};
} // end of namespace Wintermute