[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.113,1.114 dimuse.h,1.66,1.67 dimuse_script.cpp,1.31,1.32 dimuse_sndmgr.h,1.29,1.30

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


Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4479/scumm/imuse_digi

Modified Files:
	dimuse.cpp dimuse.h dimuse_script.cpp dimuse_sndmgr.h 
Log Message:
system.h was being included in tons of places, without any good reason; reduced this (total dependencies on system.h went down from 193 to 85 files)

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- dimuse.cpp	1 Jan 2005 16:09:16 -0000	1.113
+++ dimuse.cpp	10 Jan 2005 22:06:07 -0000	1.114
@@ -19,6 +19,7 @@
  */
 
 #include "stdafx.h"
+#include "common/system.h"
 #include "common/timer.h"
 
 #include "scumm/actor.h"

Index: dimuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- dimuse.h	9 Jan 2005 03:15:59 -0000	1.66
+++ dimuse.h	10 Jan 2005 22:06:08 -0000	1.67
@@ -84,7 +84,7 @@
 
 	Track *_track[MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS];
 
-	OSystem::MutexRef _mutex;
+	Common::MutexRef _mutex;
 	ScummEngine *_vm;
 	ImuseDigiSndMgr *_sound;
 

Index: dimuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_script.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- dimuse_script.cpp	1 Jan 2005 16:09:17 -0000	1.31
+++ dimuse_script.cpp	10 Jan 2005 22:06:09 -0000	1.32
@@ -19,6 +19,7 @@
  */
 
 #include "stdafx.h"
+#include "common/system.h"
 #include "common/timer.h"
 
 #include "scumm/actor.h"

Index: dimuse_sndmgr.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- dimuse_sndmgr.h	1 Jan 2005 16:09:17 -0000	1.29
+++ dimuse_sndmgr.h	10 Jan 2005 22:06:09 -0000	1.30
@@ -23,7 +23,6 @@
 
 #include "stdafx.h"
 #include "common/scummsys.h"
-#include "common/system.h"
 #include "scumm/imuse_digi/dimuse_bndmgr.h"
 
 namespace Scumm {





More information about the Scummvm-git-logs mailing list