[Scummvm-cvs-logs] CVS: scummvm/queen sound.cpp,1.51,1.52 sound.h,1.26,1.27

Max Horn fingolfin at users.sourceforge.net
Sat Mar 12 10:56:51 CET 2005


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

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

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- sound.cpp	9 Mar 2005 18:12:40 -0000	1.51
+++ sound.cpp	12 Mar 2005 18:55:41 -0000	1.52
@@ -83,10 +83,10 @@
 
 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);
 }
 

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/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:09 -0000	1.26
+++ sound.h	12 Mar 2005 18:55:41 -0000	1.27
@@ -74,8 +74,8 @@
 	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 @@
 	bool _speechSfxExists;
 	
 	int16 _lastOverride;
-	PlayingSoundHandle _sfxHandle;
-	PlayingSoundHandle _speechHandle;
+	SoundHandle _sfxHandle;
+	SoundHandle _speechHandle;
 };
 
 class SilentSound : public Sound {





More information about the Scummvm-git-logs mailing list