[Scummvm-cvs-logs] CVS: scummvm/common gameDetector.cpp,1.125,1.126 system.h,1.38,1.39

Max Horn fingolfin at users.sourceforge.net
Thu Jul 31 05:34:09 CEST 2003


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv5146/common

Modified Files:
	gameDetector.cpp system.h 
Log Message:
added new header file backends/intern.h; removed some stuff from common/system.h which is either only of interest to backends or code instantiating a backend (->backends/intern.h); also removed fmopl specific enums (->sound/fmopl.h)

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- gameDetector.cpp	30 Jul 2003 19:25:31 -0000	1.125
+++ gameDetector.cpp	31 Jul 2003 12:33:32 -0000	1.126
@@ -21,6 +21,7 @@
  */
 
 #include "stdafx.h"
+#include "backends/intern.h"
 #include "sound/mididrv.h"
 #include "engine.h"
 #include "gameDetector.h"

Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/system.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- system.h	31 Jul 2003 12:10:13 -0000	1.38
+++ system.h	31 Jul 2003 12:33:32 -0000	1.39
@@ -362,33 +362,4 @@
 	//@}
 };
 
-/* Factory functions. This means we don't have to include the headers for
- * all backends.
- */
-extern OSystem *OSystem_SDL_create(int gfx_driver, bool full_screen, bool aspect_ratio);
-extern OSystem *OSystem_NULL_create();
-extern OSystem *OSystem_MorphOS_create(int game_id, int gfx_driver, bool full_screen);
-extern OSystem *OSystem_Dreamcast_create();
-extern OSystem *OSystem_WINCE3_create();
-extern OSystem *OSystem_X11_create();
-extern OSystem *OSystem_MAC_create(int gfx_mode, bool full_screen);
-extern OSystem *OSystem_GP32_create(int gfx_mode, bool full_screen); //ph0x 
-extern OSystem *OSystem_PALMOS_create(int gfx_mode);
-
-#ifdef _WIN32_WCE
-#define SAMPLES_PER_SEC_OLD 11025
-#define SAMPLES_PER_SEC_NEW 22050
-#else
-//#define SAMPLES_PER_SEC 11025
-#define SAMPLES_PER_SEC 22050
-//#define SAMPLES_PER_SEC 44100
-#endif
-
-enum {
-	FMOPL_ENV_BITS_HQ = 16,
-	FMOPL_ENV_BITS_LQ = 8,
-	FMOPL_EG_ENT_HQ = 4096,
-	FMOPL_EG_ENT_LQ = 128
-};
-
 #endif 





More information about the Scummvm-git-logs mailing list