[Scummvm-cvs-logs] CVS: scummvm/queen sound.cpp,1.22,1.23

Max Horn fingolfin at users.sourceforge.net
Tue Dec 23 16:26:04 CET 2003


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv23172/queen

Modified Files:
	sound.cpp 
Log Message:
turned PlayingSoundHandle into an 'opaque' (well not really :-) data type, mainly because people kept (accidentally and sometimes on purpose :-) misusing them

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sound.cpp	21 Dec 2003 15:47:52 -0000	1.22
+++ sound.cpp	24 Dec 2003 00:24:56 -0000	1.23
@@ -33,7 +33,7 @@
 namespace Queen {
 
 Sound::Sound(SoundMixer *mixer, QueenEngine *vm) : 
-	_mixer(mixer), _vm(vm), _sfxToggle(true), _speechToggle(true), _musicToggle(true), _lastOverride(0), _currentSong(0), _sfxHandle(0) {
+	_mixer(mixer), _vm(vm), _sfxToggle(true), _speechToggle(true), _musicToggle(true), _lastOverride(0), _currentSong(0) {
 }
 
 Sound::~Sound() {
@@ -68,7 +68,7 @@
 }
 
 void Sound::waitSfxFinished() {
-	while(_sfxHandle != 0)
+	while(_sfxHandle.isActive())
 		_vm->input()->delay(10);
 }
 





More information about the Scummvm-git-logs mailing list