[Scummvm-cvs-logs] CVS: scummvm/sound fmopl.h,1.14,1.15 fmopl.cpp,1.25,1.26

Max Horn fingolfin at users.sourceforge.net
Mon Jan 10 14:47:13 CET 2005


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

Modified Files:
	fmopl.h fmopl.cpp 
Log Message:
eek, we put a static RandomSource instance into every file that included fmopl.h...

Index: fmopl.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/fmopl.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- fmopl.h	1 Jan 2005 16:09:22 -0000	1.14
+++ fmopl.h	10 Jan 2005 22:46:23 -0000	1.15
@@ -27,7 +27,6 @@
 #define FMOPL_H_
 
 #include "common/scummsys.h"
-#include "common/util.h"
 
 enum {
 	FMOPL_ENV_BITS_HQ = 16,
@@ -160,8 +159,6 @@
 void OPLWriteReg(FM_OPL *OPL, int r, int v);
 void YM3812UpdateOne(FM_OPL *OPL, int16 *buffer, int length);
 
-static Common::RandomSource oplRnd;			/* OPL random number generator */
-
 #endif
 
 // Factory method

Index: fmopl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/fmopl.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- fmopl.cpp	1 Jan 2005 16:09:22 -0000	1.25
+++ fmopl.cpp	10 Jan 2005 22:46:23 -0000	1.26
@@ -38,6 +38,10 @@
 #include "common/config-manager.h"
 #endif
 
+
+static Common::RandomSource oplRnd;			/* OPL random number generator */
+
+
 /* -------------------- preliminary define section --------------------- */
 /* attack/decay rate time rate */
 #define OPL_ARRATE     141280  /* RATE 4 =  2826.24ms @ 3.6MHz */





More information about the Scummvm-git-logs mailing list