[Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.50,1.51 morphos.cpp,1.10,1.11 ypa1.cpp,1.8,1.9

Max Horn fingolfin at users.sourceforge.net
Sun Sep 28 14:10:01 CEST 2003


Update of /cvsroot/scummvm/scummvm/backends/midi
In directory sc8-pr-cvs1:/tmp/cvs-serv30803/backends/midi

Modified Files:
	adlib.cpp morphos.cpp ypa1.cpp 
Log Message:
removed duplicate g_timer object (one was global, one was static to timer.cpp); set g_system earlier (might prevent a few race conditions)

Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/adlib.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- adlib.cpp	18 Sep 2003 16:01:30 -0000	1.50
+++ adlib.cpp	28 Sep 2003 21:08:47 -0000	1.51
@@ -22,7 +22,6 @@
 #include "sound/mididrv.h"
 #include "sound/fmopl.h"
 #include "sound/mixer.h"
-#include "base/engine.h"	// for g_system
 #include "common/util.h"
 
 #define BASE_FREQ 250

Index: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/morphos.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- morphos.cpp	26 Sep 2003 14:05:33 -0000	1.10
+++ morphos.cpp	28 Sep 2003 21:08:48 -0000	1.11
@@ -31,7 +31,6 @@
 
 #include "stdafx.h"
 #include "sound/mpu401.h"
-#include "base/engine.h"	// for g_system
 #include "common/util.h"
 #include "morphos.h"
 #include "morphos_sound.h"

Index: ypa1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/ypa1.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ypa1.cpp	26 Sep 2003 14:05:33 -0000	1.8
+++ ypa1.cpp	28 Sep 2003 21:08:48 -0000	1.9
@@ -20,7 +20,6 @@
 
 #include "stdafx.h"
 #include "sound/mpu401.h"
-#include "base/engine.h"	// for g_system
 #include "common/util.h"
 
 #include "Pa1Lib.h"





More information about the Scummvm-git-logs mailing list