[Scummvm-cvs-logs] CVS: scummvm/graphics animation.cpp,1.23,1.24 animation.h,1.13,1.14

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


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

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

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/animation.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- animation.cpp	11 Mar 2005 15:30:25 -0000	1.23
+++ animation.cpp	12 Mar 2005 18:55:40 -0000	1.24
@@ -185,7 +185,7 @@
 				 */
 
 				/* Avoid deadlock is sound was too far ahead */
-				if (_bgSoundStream && !_bgSound.isActive())
+				if (_bgSoundStream && !_snd->isSoundHandleActive(_bgSound))
 					return false;
 
 				if (checkPaletteSwitch() || (_bgSoundStream == NULL) ||

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/animation.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- animation.h	11 Mar 2005 15:30:25 -0000	1.13
+++ animation.h	12 Mar 2005 18:55:40 -0000	1.14
@@ -84,7 +84,7 @@
 
 	File *_mpegFile;
 
-	PlayingSoundHandle _bgSound;
+	SoundHandle _bgSound;
 	AudioStream *_bgSoundStream;
 
 #ifdef BACKEND_8BIT





More information about the Scummvm-git-logs mailing list