PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method

svn-id: r17106

2 files changed, 6 insertions, 6 deletions

diff --git a/queen/sound.cpp b/queen/sound.cpp
index a93650ea7f..f982ce9d6c 100644
--- a/queen/sound.cpp
+++ b/queen/sound.cpp
@@ -83,10 +83,10 @@ Sound *Sound::giveSound(SoundMixer *mixer, QueenEngine *vm, uint8 compression) {
 
 void Sound::waitFinished(bool isSpeech) {
 	if (isSpeech)
-		while (_speechHandle.isActive())
+		while (_mixer->isSoundHandleActive(_speechHandle))
 			_vm->input()->delay(10);
 	else
-		while (_sfxHandle.isActive())
+		while (_mixer->isSoundHandleActive(_sfxHandle))
 			_vm->input()->delay(10);
 }
 
diff --git a/queen/sound.h b/queen/sound.h
index 1311848310..6aaee1d2bf 100644
--- a/queen/sound.h
+++ b/queen/sound.h
@@ -74,8 +74,8 @@ public:
 	void musicToggle(bool val)	{ _musicToggle = val; }
 	void toggleMusic()			{ _musicToggle ^= true; }
 
-	bool isSpeechActive() const	{ return _speechHandle.isActive(); }
-	bool isSfxActive() const 	{ return _sfxHandle.isActive(); }
+	bool isSpeechActive() const	{ return _mixer->isSoundHandleActive(_speechHandle); }
+	bool isSfxActive() const 	{ return _mixer->isSoundHandleActive(_sfxHandle); }
 	
 	bool speechSfxExists() const	{ return _speechSfxExists; }
 	
@@ -112,8 +112,8 @@ protected:
 	bool _speechSfxExists;
 	
 	int16 _lastOverride;
-	PlayingSoundHandle _sfxHandle;
-	PlayingSoundHandle _speechHandle;
+	SoundHandle _sfxHandle;
+	SoundHandle _speechHandle;
 };
 
 class SilentSound : public Sound {