diff options
| author | Max Horn | 2007-07-22 09:17:23 +0000 |
|---|---|---|
| committer | Max Horn | 2007-07-22 09:17:23 +0000 |
| commit | 425e6e278b323f95af5b223d06bec74f0db8d047 (patch) | |
| tree | b427fa627f8ea635fd0108723bf4f86cfbcbdbe8 /engines/scumm/imuse_digi/dimuse_script.cpp | |
| parent | cfb4b08efcb0c608eca19fccda15f8e24a1cb2f0 (diff) | |
| download | scummvm-rg350-425e6e278b323f95af5b223d06bec74f0db8d047.tar.gz scummvm-rg350-425e6e278b323f95af5b223d06bec74f0db8d047.tar.bz2 scummvm-rg350-425e6e278b323f95af5b223d06bec74f0db8d047.zip | |
cleanup (in particular, don't call something 'soundHandle' which is not a Mixer::SoundHandle)
svn-id: r28162
Diffstat (limited to 'engines/scumm/imuse_digi/dimuse_script.cpp')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_script.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp index 186d04483e..ddc0cd5107 100644 --- a/engines/scumm/imuse_digi/dimuse_script.cpp +++ b/engines/scumm/imuse_digi/dimuse_script.cpp @@ -179,8 +179,8 @@ void IMuseDigital::flushTracks() { _mixer->stopHandle(track->mixChanHandle); delete track->stream; track->stream = NULL; - _sound->closeSound(track->soundHandle); - track->soundHandle = NULL; + _sound->closeSound(track->soundDesc); + track->soundDesc = NULL; track->used = false; } } else if (track->streamSou) { @@ -245,7 +245,7 @@ void IMuseDigital::getLipSync(int soundId, int syncId, int32 msPos, int32 &width for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { Track *track = _track[l]; if ((track->soundId == soundId) && track->used && !track->toBeRemoved) { - _sound->getSyncSizeAndPtrById(track->soundHandle, syncId, sync_size, &sync_ptr); + _sound->getSyncSizeAndPtrById(track->soundDesc, syncId, sync_size, &sync_ptr); if ((sync_size != 0) && (sync_ptr != NULL)) { sync_size /= 4; while (sync_size--) { @@ -396,8 +396,8 @@ void IMuseDigital::stopAllSounds() { _mixer->stopHandle(track->mixChanHandle); delete track->stream; track->stream = NULL; - _sound->closeSound(track->soundHandle); - track->soundHandle = NULL; + _sound->closeSound(track->soundDesc); + track->soundDesc = NULL; } else if (track->streamSou) { _mixer->stopHandle(track->mixChanHandle); delete track->streamSou; |