diff options
author | Vicent Marti | 2008-06-14 14:44:29 +0000 |
---|---|---|
committer | Vicent Marti | 2008-06-14 14:44:29 +0000 |
commit | d0b27cf9c66b9281899acf826cb205e19dcb7260 (patch) | |
tree | 74e813b1d1f081f35f41ca7a95da5d048951b9e7 /sound/mixer.h | |
parent | d51a0cab3fe494698f001d81d5d86cea7cd0395b (diff) | |
parent | 91d3ea31359950b59ee46af8355cc0f5790257e5 (diff) | |
download | scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.gz scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.bz2 scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.zip |
Merged trunk into the GUI branch.
Fixed MSVS9 project files.
svn-id: r32702
Diffstat (limited to 'sound/mixer.h')
-rw-r--r-- | sound/mixer.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/mixer.h b/sound/mixer.h index d46a933d97..26ae0898fd 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -147,7 +147,7 @@ public: SoundType type, SoundHandle *handle, void *sound, uint32 size, uint rate, byte flags, - int id = -1, byte volume = 255, int8 balance = 0, + int id = -1, byte volume = kMaxChannelVolume, int8 balance = 0, uint32 loopStart = 0, uint32 loopEnd = 0); /** @@ -174,7 +174,7 @@ public: SoundType type, SoundHandle *handle, AudioStream *input, - int id = -1, byte volume = 255, int8 balance = 0, + int id = -1, byte volume = kMaxChannelVolume, int8 balance = 0, bool autofreeStream = true, bool permanent = false, bool reverseStereo = false); @@ -258,7 +258,7 @@ public: * Set the channel volume for the given handle. * * @param handle the sound to affect - * @param volume the new channel volume (0 - 255) + * @param volume the new channel volume (0 - kMaxChannelVolume) */ void setChannelVolume(SoundHandle handle, byte volume); @@ -290,7 +290,7 @@ public: * Set the volume for the given sound type. * * @param type the sound type - * @param volume the new global volume, 0-kMaxMixerVolume + * @param volume the new global volume, 0 - kMaxMixerVolume */ void setVolumeForSoundType(SoundType type, int volume); @@ -298,7 +298,7 @@ public: * Query the global volume. * * @param type the sound type - * @return the global music volume, 0-kMaxMixerVolume + * @return the global music volume, 0 - kMaxMixerVolume */ int getVolumeForSoundType(SoundType type) const; |