From 6da96e17c0478090b67b28ef0883486fe27ace80 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 2 Aug 2003 02:11:15 +0000
Subject: fix Vorbis music volume

svn-id: r9392
---
 sound/mixer.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'sound')

diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 4a4c8634b2..b062a6fb62 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -1183,7 +1183,6 @@ ChannelVorbis::~ChannelVorbis() {
 #endif
 
 void ChannelVorbis::mix(int16 *data, uint len) {
-
 #ifdef SOX_HACK
 	assert(_input);
 	assert(_converter);
@@ -1194,7 +1193,7 @@ void ChannelVorbis::mix(int16 *data, uint len) {
 		return;
 	}
 
-	const int volume = _mixer->getVolume();
+	const int volume = isMusicChannel() ? _mixer->getMusicVolume() : _mixer->getVolume();
 	st_size_t tmpLen = len;
 	_converter->flow(*_input, data, &tmpLen, volume);
 #else
-- 
cgit v1.2.3