diff options
| author | Max Horn | 2003-12-24 17:42:22 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-24 17:42:22 +0000 |
| commit | 859a9c01290dc6022f99c7fd99ff91d62a3153dc (patch) | |
| tree | 34a40bd53ce6c75e3685ec837c4da4c0a38d01f7 /scumm/smush/smush_mixer.cpp | |
| parent | 5665d137f6bae488ac19539acdcfe441f514a9d6 (diff) | |
| download | scummvm-rg350-859a9c01290dc6022f99c7fd99ff91d62a3153dc.tar.gz scummvm-rg350-859a9c01290dc6022f99c7fd99ff91d62a3153dc.tar.bz2 scummvm-rg350-859a9c01290dc6022f99c7fd99ff91d62a3153dc.zip | |
o Added SoundMixer::isReady()
o Removed SoundMixer::bindToSystem()
o In scumm, replaced _silentMixer, _silentDigitalImuse and _noDigitalSamples by SoundMixer::isReady()
svn-id: r11893
Diffstat (limited to 'scumm/smush/smush_mixer.cpp')
| -rw-r--r-- | scumm/smush/smush_mixer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp index 3c9b831d78..69d85c6a22 100644 --- a/scumm/smush/smush_mixer.cpp +++ b/scumm/smush/smush_mixer.cpp @@ -118,7 +118,7 @@ bool SmushMixer::handleFrame() { flags |= SoundMixer::FLAG_UNSIGNED; } - if (_silentMixer == false) { + if (_mixer->isReady()) { if (!_channels[i].handle.isActive()) _mixer->newStream(&_channels[i].handle, rate, flags, 500000); _mixer->appendStream(_channels[i].handle, data, size); |