aboutsummaryrefslogtreecommitdiff
path: root/sound/mixer.cpp
diff options
context:
space:
mode:
authorMax Horn2003-09-05 22:09:56 +0000
committerMax Horn2003-09-05 22:09:56 +0000
commit3aa8454efaf6674ceade07182ae8c4b2d7f12143 (patch)
tree6fe7d250458de6e52caf6b3cfdad770d92574f24 /sound/mixer.cpp
parent0045dfe9c61ccff708d4b93eaa699ea09cdec1aa (diff)
downloadscummvm-rg350-3aa8454efaf6674ceade07182ae8c4b2d7f12143.tar.gz
scummvm-rg350-3aa8454efaf6674ceade07182ae8c4b2d7f12143.tar.bz2
scummvm-rg350-3aa8454efaf6674ceade07182ae8c4b2d7f12143.zip
moved the sound ID param in playRaw before volume/pan
svn-id: r10023
Diffstat (limited to 'sound/mixer.cpp')
-rw-r--r--sound/mixer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 04c931238e..fe9c43a65c 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -68,6 +68,8 @@ public:
_volume = volume;
}
virtual void setChannelPan(const int8 pan) {
+ if (pan != 0)
+ printf("Pan set to %d\n", pan);
_pan = pan;
}
virtual int getVolume() const {
@@ -246,7 +248,7 @@ int SoundMixer::insertChannel(PlayingSoundHandle *handle, Channel *chan) {
return index;
}
-int SoundMixer::playRaw(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate, byte flags, byte volume, int8 pan, int id, uint32 loopStart, uint32 loopEnd) {
+int SoundMixer::playRaw(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate, byte flags, int id, byte volume, int8 pan, uint32 loopStart, uint32 loopEnd) {
StackLock lock(_mutex);
// Prevent duplicate sounds