[Scummvm-cvs-logs] CVS: scummvm/sound audiocd.cpp,1.15,1.16 mixer.cpp,1.180,1.181 mixer.h,1.92,1.93 mpu401.h,1.21,1.22

[Max Horn]

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

Modified Files:
	audiocd.cpp mixer.cpp mixer.h mpu401.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: audiocd.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiocd.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- audiocd.cpp	1 Jan 2005 16:09:22 -0000	1.15
+++ audiocd.cpp	10 Jan 2005 22:06:18 -0000	1.16
@@ -28,6 +28,7 @@
 #include "base/engine.h"
 #include "common/file.h"
 #include "common/util.h"
+#include "common/system.h"
 
 struct TrackFormat {
 	/** Decodername */

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- mixer.cpp	1 Jan 2005 18:53:47 -0000	1.180
+++ mixer.cpp	10 Jan 2005 22:06:19 -0000	1.181
@@ -21,8 +21,10 @@
  */
 
 #include "stdafx.h"
+
 #include "common/file.h"
 #include "common/util.h"
+#include "common/system.h"
 
 #include "sound/mixer.h"
 #include "sound/rate.h"

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- mixer.h	1 Jan 2005 16:09:23 -0000	1.92
+++ mixer.h	10 Jan 2005 22:06:19 -0000	1.93
@@ -25,12 +25,13 @@
 
 #include "stdafx.h"
 #include "common/scummsys.h"
-#include "common/system.h"
+#include "common/mutex.h"
 
 
 class AudioStream;
 class Channel;
 class File;
+class OSystem;
 
 class PlayingSoundHandle {
 	friend class Channel;
@@ -88,7 +89,7 @@
 	};
 
 	OSystem *_syst;
-	OSystem::MutexRef _mutex;
+	Common::MutexRef _mutex;
 
 	Channel *_premixChannel;
 

Index: mpu401.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mpu401.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- mpu401.h	1 Jan 2005 16:09:23 -0000	1.21
+++ mpu401.h	10 Jan 2005 22:06:19 -0000	1.22
@@ -23,7 +23,6 @@
 #define SOUND_MPU401_H
 
 #include "stdafx.h"
-#include "common/system.h"
 #include "mididrv.h"
 
 ////////////////////////////////////////