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

svn-id: r17106

4 files changed, 9 insertions, 9 deletions

diff --git a/sky/intro.cpp b/sky/intro.cpp
index 39f06688dc..e4a517b0e9 100644
--- a/sky/intro.cpp
+++ b/sky/intro.cpp
@@ -742,7 +742,7 @@ bool Intro::nextPart(uint16 *&data) {
 				SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED, SOUND_VOICE);
 		return true;
 	case WAITVOICE:
-		while (_voice.isActive())
+		while (_mixer->isSoundHandleActive(_voice))
 			if (!escDelay(50))
 				return false;
 		return true;
diff --git a/sky/intro.h b/sky/intro.h
index 2072426e35..2e97663781 100644
--- a/sky/intro.h
+++ b/sky/intro.h
@@ -56,7 +56,7 @@ private:
 	uint8 *_textBuf, *_saveBuf;
 	uint8 *_bgBuf;
 	uint32 _bgSize;
-	PlayingSoundHandle _voice, _bgSfx;
+	SoundHandle _voice, _bgSfx;
 
 	int32 _relDelay;
 
diff --git a/sky/sound.cpp b/sky/sound.cpp
index 0ee872ea32..0efc41bf9e 100644
--- a/sky/sound.cpp
+++ b/sky/sound.cpp
@@ -1031,7 +1031,7 @@ Sound::~Sound(void) {
 	if (_soundData) free(_soundData);
 }
 
-void Sound::playSound(uint32 id, byte *sound, uint32 size, PlayingSoundHandle *handle) {
+void Sound::playSound(uint32 id, byte *sound, uint32 size, SoundHandle *handle) {
 
 	byte flags = 0;
 	flags |= SoundMixer::FLAG_UNSIGNED|SoundMixer::FLAG_AUTOFREE;
diff --git a/sky/sound.h b/sky/sound.h
index 0ca220f5cf..b6888977c7 100644
--- a/sky/sound.h
+++ b/sky/sound.h
@@ -50,16 +50,16 @@ protected:
 public:
 
 	SoundMixer *_mixer;
-	PlayingSoundHandle _voiceHandle;
-	PlayingSoundHandle _effectHandle;
-	PlayingSoundHandle _bgSoundHandle;
-	PlayingSoundHandle _ingameSound0, _ingameSound1, _ingameSpeech;
+	SoundHandle _voiceHandle;
+	SoundHandle _effectHandle;
+	SoundHandle _bgSoundHandle;
+	SoundHandle _ingameSound0, _ingameSound1, _ingameSpeech;
 
 	uint16 _saveSounds[2];
 
 protected:
 
-	void playSound(uint32 id, byte *sound, uint32 size, PlayingSoundHandle *handle);
+	void playSound(uint32 id, byte *sound, uint32 size, SoundHandle *handle);
 
 public:
 	Sound(SoundMixer *mixer, Disk *pDisk, uint8 pVolume);
@@ -69,7 +69,7 @@ public:
 	void playSound(uint16 sound, uint16 volume, uint8 channel);
 	void fnStartFx(uint32 sound, uint8 channel);
 	bool startSpeech(uint16 textNum);
-	bool speechFinished(void) { return !_ingameSpeech.isActive(); };
+	bool speechFinished(void) { return !_mixer->isSoundHandleActive(_ingameSpeech); };
 	void fnPauseFx(void);
 	void fnUnPauseFx(void);
 	void fnStopFx(void);