diff options
| author | Max Horn | 2005-03-12 18:56:09 +0000 |
|---|---|---|
| committer | Max Horn | 2005-03-12 18:56:09 +0000 |
| commit | 7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8 (patch) | |
| tree | 7849605aa45912d9cbe65dbb68b2b450bd32b023 /scumm/smush/smush_mixer.cpp | |
| parent | 8de216f3aec1dcee16fc0ab9974da4087bac5252 (diff) | |
| download | scummvm-rg350-7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8.tar.gz scummvm-rg350-7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8.tar.bz2 scummvm-rg350-7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8.zip | |
PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method
svn-id: r17106
Diffstat (limited to 'scumm/smush/smush_mixer.cpp')
| -rw-r--r-- | scumm/smush/smush_mixer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp index 791b689491..c787f3aafc 100644 --- a/scumm/smush/smush_mixer.cpp +++ b/scumm/smush/smush_mixer.cpp @@ -69,7 +69,7 @@ void SmushMixer::addChannel(SmushChannel *c) { } for (i = 0; i < NUM_CHANNELS; i++) { - if ((_channels[i].chan == NULL || _channels[i].id == -1) && !_channels[i].handle.isActive()) { + if ((_channels[i].chan == NULL || _channels[i].id == -1) && !_mixer->isSoundHandleActive(_channels[i].handle)) { _channels[i].chan = c; _channels[i].id = track; return; @@ -120,7 +120,7 @@ bool SmushMixer::handleFrame() { } if (_mixer->isReady()) { - if (!_channels[i].handle.isActive()) { + if (!_mixer->isSoundHandleActive(_channels[i].handle)) { _channels[i].stream = makeAppendableAudioStream(rate, flags, 500000); _mixer->playInputStream(SoundMixer::kSFXSoundType, &_channels[i].handle, _channels[i].stream); } |