From 8de1ace6c7a8cb2d18abdea56edb7991731ba38f Mon Sep 17 00:00:00 2001
From: James Brown
Date: Sun, 21 Jul 2002 06:55:33 +0000
Subject: Apply patch from Torbj�rn Andersson to make MP3_CDMUSIC mixer use
 music_volume instead of sfx_volume.

svn-id: r4611
---
 sound/mixer.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'sound/mixer.cpp')

diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 73b793814c..e44b459ca4 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -201,6 +201,11 @@ void SoundMixer::set_volume(int volume)
 		_volume_table[i] = ((int8)i) * volume;
 }
 
+void SoundMixer::set_music_volume(int volume)
+{
+	_music_volume = volume;
+}
+
 #ifdef COMPRESSED_SOUND_FILE
 bool SoundMixer::Channel::sound_finished()
 {
@@ -710,8 +715,7 @@ void SoundMixer::Channel_MP3_CDMUSIC::mix(int16 *data, uint len)
 {
 	mad_fixed_t const *ch;
 	mad_timer_t frame_duration;
-	const int16 *vol_tab = _mixer->_volume_table;
-	unsigned char volume = ((int)vol_tab[1]) * 32 / 255;
+	unsigned char volume = _mixer->_music_volume * 32 / 255;
 
 	if (_to_be_destroyed) {
 		real_destroy();
-- 
cgit v1.2.3