diff options
| author | Christopher Page | 2008-06-11 17:36:21 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-06-11 17:36:21 +0000 |
| commit | e86a422e252ade394ca796cae767c4d3221d3c4a (patch) | |
| tree | cce35a7a31f15119d531a91448a19029e0099b99 /sound | |
| parent | 4fddafa3e6ef1c250804ea6ce9baaf2a911027e8 (diff) | |
| parent | 33fd755a0ebab6d3ca4e877b15c4d3d7d25877f9 (diff) | |
| download | scummvm-rg350-e86a422e252ade394ca796cae767c4d3221d3c4a.tar.gz scummvm-rg350-e86a422e252ade394ca796cae767c4d3221d3c4a.tar.bz2 scummvm-rg350-e86a422e252ade394ca796cae767c4d3221d3c4a.zip | |
Merged revisions 32564-32565,32567-32575,32577,32579-32594,32596-32603,32605-32639,32644-32646,32648-32666 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r32667
Diffstat (limited to 'sound')
| -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; |