[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.cpp,1.45,1.46 d_sound.h,1.11,1.12

Max Horn fingolfin at users.sourceforge.net
Wed Sep 10 05:54:03 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv18561/bs2/driver

Modified Files:
	d_sound.cpp d_sound.h 
Log Message:
added refCon parameter to timer class

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- d_sound.cpp	5 Sep 2003 22:09:56 -0000	1.45
+++ d_sound.cpp	10 Sep 2003 12:43:53 -0000	1.46
@@ -203,8 +203,9 @@
   -200, -100, -50, 0
 };
 */
-void sword2_sound_handler (void *engine) {
-	g_sword2->_sound->FxServer();
+void sword2_sound_handler(void *refCon) {
+	Sword2Sound *sound = (Sword2Sound *)refCon;
+	sound->FxServer();
 }
 
 Sword2Sound::Sword2Sound(SoundMixer *mixer) {
@@ -246,7 +247,7 @@
 	memset(bufferSizeFx, 0, sizeof(bufferSizeFx));
 
 	soundOn = 1;
-	g_engine->_timer->installProcedure(sword2_sound_handler, 100000);
+	g_engine->_timer->installProcedure(sword2_sound_handler, 100000, this);
 }
 
 Sword2Sound::~Sword2Sound() {

Index: d_sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- d_sound.h	5 Sep 2003 12:19:40 -0000	1.11
+++ d_sound.h	10 Sep 2003 12:43:53 -0000	1.12
@@ -41,7 +41,7 @@
 #include "sound/mixer.h"
 #include "common/file.h"
 
-void sword2_sound_handler (void *engine);
+extern void sword2_sound_handler(void *refCon);
 
 class Sword2Sound {
 	public:





More information about the Scummvm-git-logs mailing list