aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/imuse_digi
diff options
context:
space:
mode:
authorMax Horn2007-02-03 18:08:10 +0000
committerMax Horn2007-02-03 18:08:10 +0000
commit0fc672025c02c167d8a479b1a8961c3a4545e05a (patch)
treea67f994fbfdc8a2e8bfc5a73ec0146fe2c5e8805 /engines/scumm/imuse_digi
parent9c7dd9162683217e48a91bee8fbdd631d20a12e6 (diff)
downloadscummvm-rg350-0fc672025c02c167d8a479b1a8961c3a4545e05a.tar.gz
scummvm-rg350-0fc672025c02c167d8a479b1a8961c3a4545e05a.tar.bz2
scummvm-rg350-0fc672025c02c167d8a479b1a8961c3a4545e05a.zip
Removed obsolete call to Mixer::isPaused
svn-id: r25353
Diffstat (limited to 'engines/scumm/imuse_digi')
-rw-r--r--engines/scumm/imuse_digi/dimuse.cpp5
-rw-r--r--engines/scumm/imuse_digi/dimuse_script.cpp1
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp
index 8d1dab64a7..7e70268b12 100644
--- a/engines/scumm/imuse_digi/dimuse.cpp
+++ b/engines/scumm/imuse_digi/dimuse.cpp
@@ -46,6 +46,9 @@ void IMuseDigital::timer_handler(void *refCon) {
IMuseDigital::IMuseDigital(ScummEngine_v7 *scumm, Audio::Mixer *mixer, int fps)
: _vm(scumm), _mixer(mixer) {
+ assert(_vm);
+ assert(mixer);
+
_pause = false;
_sound = new ImuseDigiSndMgr(_vm);
assert(_sound);
@@ -216,7 +219,7 @@ void IMuseDigital::callback() {
continue;
}
- if (_pause || !_vm)
+ if (_pause)
return;
if (track->volFadeUsed) {
diff --git a/engines/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp
index 0c131775ea..f2ca4f6f81 100644
--- a/engines/scumm/imuse_digi/dimuse_script.cpp
+++ b/engines/scumm/imuse_digi/dimuse_script.cpp
@@ -172,7 +172,6 @@ void IMuseDigital::flushTracks() {
track->stream->finish();
}
if (track->stream->endOfStream()
- || _mixer->isPaused() // hack for paused Mixer
|| _vm->_insaneRunning) { // INSANE hack for sync timer mode
_mixer->stopHandle(track->handle);
delete track->stream;