From 791efd853aacee15bb2f5b2e575c59fd9bb7480d Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 25 Jul 2003 01:19:14 +0000
Subject: lots of mixer changes: replaced _volumeTable by _globalVolume
 (applying volume after resampling is more accurate); made more member vars of
 SoundMixer protected (and thus added some new getter methods); added
 (untested) support for a second (stereo) channel when playing MP3

svn-id: r9184
---
 scumm/sound.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scumm')

diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index f2b8742561..9be43dc403 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -1695,15 +1695,15 @@ int Sound::pollMP3CD() const {
 }
 
 int Sound::updateMP3CD() {
-	if (_dig_cd.playing == false)
+	if (!_dig_cd.playing)
 		return -1;
 
-	if (_scumm->_mixer->_channels[_dig_cd.index] == NULL) {
+	if (!_scumm->_mixer->isChannelUsed(_dig_cd.index)) {
 		warning("Error in MP3 decoding");
 		return -1;
 	}
 
-	if (!_scumm->_mixer->isActiveChannel(_dig_cd.index)) {
+	if (!_scumm->_mixer->isChannelActive(_dig_cd.index)) {
 		if (_dig_cd.num_loops == -1 || --_dig_cd.num_loops > 0)
 			playMP3CDTrack(_dig_cd.track, _dig_cd.num_loops, _dig_cd.start, _dig_cd.duration);
 		else
-- 
cgit v1.2.3