aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sound/mixer.cpp3
1 files changed, 1 insertions, 2 deletions
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