[Scummvm-cvs-logs] CVS: scummvm/sky intro.cpp,1.55,1.56 intro.h,1.7,1.8 sound.cpp,1.49,1.50 sound.h,1.26,1.27

Max Horn fingolfin at users.sourceforge.net
Sat Mar 12 10:57:25 CET 2005


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9326/sky

Modified Files:
	intro.cpp intro.h sound.cpp sound.h 
Log Message:
PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method

Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- intro.cpp	10 Jan 2005 22:06:16 -0000	1.55
+++ intro.cpp	12 Mar 2005 18:56:04 -0000	1.56
@@ -742,7 +742,7 @@
 				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;

Index: intro.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- intro.h	1 Jan 2005 16:09:21 -0000	1.7
+++ intro.h	12 Mar 2005 18:56:04 -0000	1.8
@@ -56,7 +56,7 @@
 	uint8 *_textBuf, *_saveBuf;
 	uint8 *_bgBuf;
 	uint32 _bgSize;
-	PlayingSoundHandle _voice, _bgSfx;
+	SoundHandle _voice, _bgSfx;
 
 	int32 _relDelay;
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- sound.cpp	1 Jan 2005 16:09:21 -0000	1.49
+++ sound.cpp	12 Mar 2005 18:56:04 -0000	1.50
@@ -1031,7 +1031,7 @@
 	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;

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sound.h	1 Jan 2005 16:09:21 -0000	1.26
+++ sound.h	12 Mar 2005 18:56:05 -0000	1.27
@@ -50,16 +50,16 @@
 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 @@
 	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);





More information about the Scummvm-git-logs mailing list