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/imuse_digi | |
| 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/imuse_digi')
| -rw-r--r-- | scumm/imuse_digi/dimuse.h | 2 | ||||
| -rw-r--r-- | scumm/imuse_digi/dimuse_script.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h index bbdc56a089..cb8e9892c6 100644 --- a/scumm/imuse_digi/dimuse.h +++ b/scumm/imuse_digi/dimuse.h @@ -77,7 +77,7 @@ private: int32 mixerFlags; ImuseDigiSndMgr::soundStruct *soundHandle; - PlayingSoundHandle handle; + SoundHandle handle; AppendableAudioStream *stream; AudioStream *stream2; diff --git a/scumm/imuse_digi/dimuse_script.cpp b/scumm/imuse_digi/dimuse_script.cpp index 356e004bdb..8a2e77f283 100644 --- a/scumm/imuse_digi/dimuse_script.cpp +++ b/scumm/imuse_digi/dimuse_script.cpp @@ -279,7 +279,7 @@ int IMuseDigital::getSoundStatus(int sound) const { for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { Track *track = _track[l]; if (track->soundId == sound) { - if ((track->stream2 && track->handle.isActive()) || + if ((track->stream2 && _vm->_mixer->isSoundHandleActive(track->handle)) || (track->stream && track->used && !track->readyToRemove)) { return 1; } |