From 690d38cfc4afeb04d1c8bde1baebe0c962cb1ab4 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 6 Jan 2008 14:59:46 +0000
Subject: Unify mixer pan/vol setting code

svn-id: r30308
---
 engines/scumm/imuse_digi/dimuse.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'engines/scumm/imuse_digi/dimuse.cpp')

diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp
index 7af4d84676..3375d7fdfe 100644
--- a/engines/scumm/imuse_digi/dimuse.cpp
+++ b/engines/scumm/imuse_digi/dimuse.cpp
@@ -321,8 +321,6 @@ void IMuseDigital::callback() {
 						curFeedSize = feedSize;
 
 					if (_mixer->isReady()) {
-						_mixer->setChannelVolume(track->mixChanHandle, track->getVol());
-						_mixer->setChannelBalance(track->mixChanHandle, track->getPan());
 						track->stream->queueBuffer(tmpSndBufferPtr, curFeedSize);
 						track->regionOffset += curFeedSize;
 					} else
@@ -336,11 +334,10 @@ void IMuseDigital::callback() {
 					feedSize -= curFeedSize;
 					assert(feedSize >= 0);
 				} while (feedSize != 0);
-			} else {
-				if (_mixer->isReady()) {
-					_mixer->setChannelVolume(track->mixChanHandle, track->getVol());
-					_mixer->setChannelBalance(track->mixChanHandle, track->getPan());
-				}
+			}
+			if (_mixer->isReady()) {
+				_mixer->setChannelVolume(track->mixChanHandle, track->getVol());
+				_mixer->setChannelBalance(track->mixChanHandle, track->getPan());
 			}
 		}
 	}
-- 
cgit v1.2.3