[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.139,1.140 dialogs.cpp,1.120,1.121 imuse.cpp,2.125,2.126 imuse.h,1.57,1.58 input.cpp,2.10,2.11 player_v2.cpp,2.54,2.55 player_v2.h,2.32,2.33 saveload.cpp,1.190,1.191 script_v5.cpp,1.270,1.271 script_v72he.cpp,2.196,2.197 script_v8.cpp,2.280,2.281 scumm.cpp,1.293,1.294 sound.cpp,1.410,1.411

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


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

Modified Files:
	debugger.cpp dialogs.cpp imuse.cpp imuse.h input.cpp 
	player_v2.cpp player_v2.h saveload.cpp script_v5.cpp 
	script_v72he.cpp script_v8.cpp scumm.cpp sound.cpp 
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: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- debugger.cpp	1 Jan 2005 16:09:13 -0000	1.139
+++ debugger.cpp	10 Jan 2005 22:05:41 -0000	1.140
@@ -23,6 +23,7 @@
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/str.h"
+#include "common/system.h"
 #include "common/util.h"
 
 #include "scumm/actor.h"

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- dialogs.cpp	1 Jan 2005 16:09:13 -0000	1.120
+++ dialogs.cpp	10 Jan 2005 22:05:41 -0000	1.121
@@ -21,6 +21,7 @@
 #include "stdafx.h"
 
 #include "common/config-manager.h"
+#include "common/system.h"
 
 #include "gui/chooser.h"
 #include "gui/newgui.h"

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.125
retrieving revision 2.126
diff -u -d -r2.125 -r2.126
--- imuse.cpp	7 Jan 2005 14:42:05 -0000	2.125
+++ imuse.cpp	10 Jan 2005 22:05:42 -0000	2.126
@@ -25,6 +25,7 @@
 #include "base/version.h"
 
 #include "common/util.h"
+#include "common/system.h"
 
 #include "scumm/imuse.h"
 #include "scumm/imuse_internal.h"

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- imuse.h	1 Jan 2005 16:09:14 -0000	1.57
+++ imuse.h	10 Jan 2005 22:05:44 -0000	1.58
@@ -24,7 +24,7 @@
 #define IMUSE_H
 
 #include "common/scummsys.h"
-#include "common/system.h"
+#include "common/mutex.h"
 #include "scumm/music.h"
 
 class MidiDriver;
@@ -40,7 +40,7 @@
 private:
 	OSystem *_system;
 	IMuseInternal *_target;
-	mutable OSystem::MutexRef _mutex;
+	mutable Common::MutexRef _mutex;
 
 	IMuse(OSystem *system, IMuseInternal *target);
 	void in() const;

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -d -r2.10 -r2.11
--- input.cpp	1 Jan 2005 16:09:14 -0000	2.10
+++ input.cpp	10 Jan 2005 22:05:44 -0000	2.11
@@ -23,6 +23,7 @@
 #include "stdafx.h"
 
 #include "common/config-manager.h"
+#include "common/system.h"
 
 #include "scumm/debugger.h"
 #include "scumm/imuse.h"

Index: player_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.cpp,v
retrieving revision 2.54
retrieving revision 2.55
diff -u -d -r2.54 -r2.55
--- player_v2.cpp	1 Jan 2005 16:09:14 -0000	2.54
+++ player_v2.cpp	10 Jan 2005 22:05:44 -0000	2.55
@@ -22,6 +22,7 @@
 
 #include "stdafx.h"
 #include "base/engine.h"
+#include "common/system.h"
 #include "scumm/player_v2.h"
 #include "scumm/scumm.h"
 #include "sound/mididrv.h"
@@ -963,6 +964,14 @@
 		lowPassFilter(data, len);
 }
 
+void Player_V2::mutex_up() {
+	_system->lockMutex (_mutex);
+}
+
+void Player_V2::mutex_down() {
+	_system->unlockMutex (_mutex);
+}
+
 } // End of namespace Scumm
 
 #ifdef __PALM_OS__

Index: player_v2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.h,v
retrieving revision 2.32
retrieving revision 2.33
diff -u -d -r2.32 -r2.33
--- player_v2.h	1 Jan 2005 16:09:15 -0000	2.32
+++ player_v2.h	10 Jan 2005 22:05:45 -0000	2.33
@@ -24,7 +24,7 @@
 #define PLAYER_V2_H
 
 #include "common/scummsys.h"
-#include "common/system.h"
+#include "common/mutex.h"
 #include "scumm/music.h"
 #include "sound/audiostream.h"
 
@@ -133,12 +133,12 @@
 
 	const uint16 *_freqs_table;
 
-	OSystem::MutexRef _mutex;
+	Common::MutexRef _mutex;
 	ChannelInfo _channels[5];
 
 protected:
-	void mutex_up() { _system->lockMutex (_mutex); }
-	void mutex_down() { _system->unlockMutex (_mutex); }
+	void mutex_up();
+	void mutex_down();
 
 	virtual void nextTick();
 	virtual void clear_channel(int i);

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- saveload.cpp	6 Jan 2005 15:57:12 -0000	1.190
+++ saveload.cpp	10 Jan 2005 22:05:45 -0000	1.191
@@ -23,6 +23,8 @@
 #include "stdafx.h"
 
 #include "common/config-manager.h"
+#include "common/savefile.h"
+#include "common/system.h"
 
 #include "scumm/actor.h"
 #include "scumm/charset.h"

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -d -r1.270 -r1.271
--- script_v5.cpp	1 Jan 2005 16:09:16 -0000	1.270
+++ script_v5.cpp	10 Jan 2005 22:05:46 -0000	1.271
@@ -28,6 +28,7 @@
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
 #include "scumm/verbs.h"
+#include "common/savefile.h"
 
 namespace Scumm {
 

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.196
retrieving revision 2.197
diff -u -d -r2.196 -r2.197
--- script_v72he.cpp	1 Jan 2005 16:09:16 -0000	2.196
+++ script_v72he.cpp	10 Jan 2005 22:05:46 -0000	2.197
@@ -24,6 +24,7 @@
 #include "stdafx.h"
 
 #include "common/config-manager.h"
+#include "common/system.h"
 
 #include "scumm/actor.h"
 #include "scumm/charset.h"

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.280
retrieving revision 2.281
diff -u -d -r2.280 -r2.281
--- script_v8.cpp	1 Jan 2005 16:09:16 -0000	2.280
+++ script_v8.cpp	10 Jan 2005 22:05:47 -0000	2.281
@@ -21,6 +21,7 @@
 
 #include "stdafx.h"
 #include "common/config-manager.h"
+#include "common/system.h"
 #include "scumm/actor.h"
 #include "scumm/akos.h"
 #include "scumm/charset.h"

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -d -r1.293 -r1.294
--- scumm.cpp	5 Jan 2005 01:26:57 -0000	1.293
+++ scumm.cpp	10 Jan 2005 22:05:50 -0000	1.294
@@ -29,6 +29,7 @@
 
 #include "common/config-manager.h"
 #include "common/md5.h"
+#include "common/system.h"
 
 #include "gui/message.h"
 #include "gui/newgui.h"

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -d -r1.410 -r1.411
--- sound.cpp	9 Jan 2005 03:15:58 -0000	1.410
+++ sound.cpp	10 Jan 2005 22:06:05 -0000	1.411
@@ -29,6 +29,7 @@
 #include "scumm/sound.h"
 
 #include "common/config-manager.h"
+#include "common/system.h"
 #include "common/timer.h"
 #include "common/util.h"
 





More information about the Scummvm-git-logs mailing list