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
---
 sword1/sound.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sword1/sound.cpp')

diff --git a/sword1/sound.cpp b/sword1/sound.cpp
index a55c476448..cde9e867dc 100644
--- a/sword1/sound.cpp
+++ b/sword1/sound.cpp
@@ -100,7 +100,7 @@ void Sound::engine(void) {
 			if (_fxQueue[cnt2].delay == 0)
 				playSample(&_fxQueue[cnt2]);
 		} else {
-			if (!_fxQueue[cnt2].handle.isActive()) { // sound finished
+			if (!_mixer->isSoundHandleActive(_fxQueue[cnt2].handle)) { // sound finished
 				_resMan->resClose(_fxList[_fxQueue[cnt2].id].sampleId);
 				if (cnt2 != _endOfQueue-1)
 					_fxQueue[cnt2] = _fxQueue[_endOfQueue - 1];
@@ -130,7 +130,7 @@ bool Sound::amISpeaking(void) {
 }
 
 bool Sound::speechFinished(void) {
-	return !_speechHandle.isActive();
+	return !_mixer->isSoundHandleActive(_speechHandle);
 }
 
 void Sound::newScreen(uint32 screen) {
-- 
cgit v1.2.3