From 7cd2cb2b1700b85d48aed8898b08b49b9b46ebf8 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 12 Mar 2005 18:56:09 +0000
Subject: PlayingSoundHandle -> SoundHandle; also, turned the handle activity
 check into a mixer method

svn-id: r17106
---
 scumm/imuse_digi/dimuse.h          | 2 +-
 scumm/imuse_digi/dimuse_script.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'scumm/imuse_digi')

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;
 			}
-- 
cgit v1.2.3