diff options
| author | Colin Snover | 2016-08-06 11:14:44 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-08-06 11:37:18 -0500 |
| commit | 949919bebd3923d59de3f4999e3b5c471fa00374 (patch) | |
| tree | 8672ca0671af5419ddba4158e7e61712e989b821 | |
| parent | 6a7ddd8ba17fd67525181762d5f4f11bf1cb592e (diff) | |
| download | scummvm-rg350-949919bebd3923d59de3f4999e3b5c471fa00374.tar.gz scummvm-rg350-949919bebd3923d59de3f4999e3b5c471fa00374.tar.bz2 scummvm-rg350-949919bebd3923d59de3f4999e3b5c471fa00374.zip | |
SCI32: Remove VMD flags from Audio32 mixer
The VMD decoder sends audio directly to the system mixer.
| -rw-r--r-- | engines/sci/sound/audio32.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/sound/audio32.h | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/engines/sci/sound/audio32.cpp b/engines/sci/sound/audio32.cpp index 0cf8e3cb13..288b7c00f5 100644 --- a/engines/sci/sound/audio32.cpp +++ b/engines/sci/sound/audio32.cpp @@ -309,11 +309,6 @@ int Audio32::readBuffer(Audio::st_sample_t *buffer, const int numSamples) { continue; } - if (channel.vmd) { - // TODO: VMD audio into output buffer - continue; - } - Audio::st_volume_t leftVolume, rightVolume; if (channel.pan == -1 || !isStereo()) { @@ -605,7 +600,6 @@ uint16 Audio32::play(int16 channelIndex, const ResourceId resourceId, const bool channel.resource = resource; channel.loop = loop; channel.robot = false; - channel.vmd = false; channel.fadeStartTick = 0; channel.soundNode = soundNode; channel.volume = volume < 0 || volume > kMaxVolume ? (int)kMaxVolume : volume; diff --git a/engines/sci/sound/audio32.h b/engines/sci/sound/audio32.h index b0c1ba1998..ac3176cc5a 100644 --- a/engines/sci/sound/audio32.h +++ b/engines/sci/sound/audio32.h @@ -123,12 +123,6 @@ struct AudioChannel { bool robot; /** - * Whether or not this channel contains a VMD audio - * track. - */ - bool vmd; - - /** * For digital sound effects, the related VM * Sound::nodePtr object for the sound. */ |