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/imuse_digi.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/imuse_digi.cpp')
| -rw-r--r-- | scumm/imuse_digi.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp index 5cc84e2a75..6ec5293762 100644 --- a/scumm/imuse_digi.cpp +++ b/scumm/imuse_digi.cpp @@ -800,7 +800,7 @@ void IMuseDigital::mixerCallback() { memcpy(buf, _channel[l].data + _channel[l].offset, mixer_size); _channel[l].offset += mixer_size; - if (_scumm->_silentDigitalImuse == false) { + if (_scumm->_mixer->isReady()) { if (!_channel[l].handle.isActive()) _scumm->_mixer->newStream(&_channel[l].handle, _channel[l].freq, _channel[l].mixerFlags, 100000); @@ -1243,7 +1243,7 @@ void IMuseDigital::music_handler(void *refCon) { } void IMuseDigital::playBundleMusic(const char *song) { - if (_scumm->_silentDigitalImuse) { + if (!_scumm->_mixer->isReady()) { return; } @@ -1430,7 +1430,7 @@ void IMuseDigital::playBundleSound(const char *sound, PlayingSoundHandle *handle byte *final; bool result; - if (_scumm->_noDigitalSamples) + if (!_scumm->_mixer->isReady()) return; if (_scumm->_gameId == GID_CMI) { |