aboutsummaryrefslogtreecommitdiff
path: root/sound/mixer.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-12-22 19:19:04 +0000
committerTorbjörn Andersson2003-12-22 19:19:04 +0000
commitcb782764b40fd15c5234e33faf0747e5ebf995b3 (patch)
tree5d199641ebf6e971829e0f519d4e69d867ebea5f /sound/mixer.cpp
parente01c3e1b1d04188e4aca270d3e5fd715fdffba2c (diff)
downloadscummvm-rg350-cb782764b40fd15c5234e33faf0747e5ebf995b3.tar.gz
scummvm-rg350-cb782764b40fd15c5234e33faf0747e5ebf995b3.tar.bz2
scummvm-rg350-cb782764b40fd15c5234e33faf0747e5ebf995b3.zip
Fix warning generated by the incomprehensibly picky MinGW GCC compiler.
svn-id: r11858
Diffstat (limited to 'sound/mixer.cpp')
-rw-r--r--sound/mixer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 772f38e9bd..1a069bb3b0 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -463,12 +463,12 @@ void SoundMixer::setMusicVolume(int volume) {
Channel::Channel(SoundMixer *mixer, PlayingSoundHandle *handle, bool isMusic, byte volume, int8 pan, int id)
- : _mixer(mixer), _handle(handle), _isMusic(isMusic), _volume(volume), _pan(pan), _paused(false), _converter(0), _input(0), _id(id) {
+ : _mixer(mixer), _handle(handle), _isMusic(isMusic), _volume(volume), _pan(pan), _paused(false), _id(id), _converter(0), _input(0) {
assert(mixer);
}
Channel::Channel(SoundMixer *mixer, PlayingSoundHandle *handle, AudioInputStream *input, bool isMusic, byte volume, int8 pan, bool reverseStereo, int id)
- : _mixer(mixer), _handle(handle), _isMusic(isMusic), _volume(volume), _pan(pan), _paused(false), _converter(0), _input(input), _id(id) {
+ : _mixer(mixer), _handle(handle), _isMusic(isMusic), _volume(volume), _pan(pan), _paused(false), _id(id), _converter(0), _input(input) {
assert(mixer);
assert(input);