aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/imuse_digi/dimuse_script.cpp
diff options
context:
space:
mode:
authorMax Horn2006-10-21 12:44:10 +0000
committerMax Horn2006-10-21 12:44:10 +0000
commit9edf1e6a1a95f45b9883e298edc7e578ff9495d1 (patch)
tree897a46c0e4bbc22c8422bd3b96545bfeea3a4a0f /engines/scumm/imuse_digi/dimuse_script.cpp
parent86d3f30347d5ee7ee67a4f16d5043b9bef0539db (diff)
downloadscummvm-rg350-9edf1e6a1a95f45b9883e298edc7e578ff9495d1.tar.gz
scummvm-rg350-9edf1e6a1a95f45b9883e298edc7e578ff9495d1.tar.bz2
scummvm-rg350-9edf1e6a1a95f45b9883e298edc7e578ff9495d1.zip
cleanup
svn-id: r24407
Diffstat (limited to 'engines/scumm/imuse_digi/dimuse_script.cpp')
-rw-r--r--engines/scumm/imuse_digi/dimuse_script.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp
index b55855262d..0c131775ea 100644
--- a/engines/scumm/imuse_digi/dimuse_script.cpp
+++ b/engines/scumm/imuse_digi/dimuse_script.cpp
@@ -172,9 +172,9 @@ void IMuseDigital::flushTracks() {
track->stream->finish();
}
if (track->stream->endOfStream()
- || _vm->_mixer->isPaused() // hack for paused Mixer
+ || _mixer->isPaused() // hack for paused Mixer
|| _vm->_insaneRunning) { // INSANE hack for sync timer mode
- _vm->_mixer->stopHandle(track->handle);
+ _mixer->stopHandle(track->handle);
delete track->stream;
track->stream = NULL;
_sound->closeSound(track->soundHandle);
@@ -182,7 +182,7 @@ void IMuseDigital::flushTracks() {
track->used = false;
}
} else if (track->stream2) {
- _vm->_mixer->stopHandle(track->handle);
+ _mixer->stopHandle(track->handle);
delete track->stream2;
track->stream2 = NULL;
track->used = false;
@@ -285,7 +285,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 && _vm->_mixer->isSoundHandleActive(track->handle)) ||
+ if ((track->stream2 && _mixer->isSoundHandleActive(track->handle)) ||
(track->stream && track->used && !track->readyToRemove)) {
return 1;
}