diff options
| author | Max Horn | 2003-08-02 02:11:15 +0000 |
|---|---|---|
| committer | Max Horn | 2003-08-02 02:11:15 +0000 |
| commit | 6da96e17c0478090b67b28ef0883486fe27ace80 (patch) | |
| tree | 13ed6430931229fa0827a631b3fa72e5801aacf7 /sound | |
| parent | 103112dd3da9e9b8ee0610d4cc6dc4a8320f2b98 (diff) | |
| download | scummvm-rg350-6da96e17c0478090b67b28ef0883486fe27ace80.tar.gz scummvm-rg350-6da96e17c0478090b67b28ef0883486fe27ace80.tar.bz2 scummvm-rg350-6da96e17c0478090b67b28ef0883486fe27ace80.zip | |
fix Vorbis music volume
svn-id: r9392
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mixer.cpp | 3 |
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 |