[Scummvm-cvs-logs] CVS: scummvm/sky/music mt32music.cpp,1.21,1.22 musicbase.cpp,1.22,1.23 musicbase.h,1.15,1.16

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


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

Modified Files:
	mt32music.cpp musicbase.cpp musicbase.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: mt32music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/mt32music.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- mt32music.cpp	1 Jan 2005 16:09:22 -0000	1.21
+++ mt32music.cpp	10 Jan 2005 22:06:18 -0000	1.22
@@ -22,6 +22,7 @@
 #include "sky/music/mt32music.h"
 #include "sky/music/gmchannel.h"
 #include "common/util.h"
+#include "common/system.h"
 #include "sound/mididrv.h"
 
 namespace Sky {
@@ -96,7 +97,8 @@
 
 	uint8 sysExBuf[15];
 	uint8 crc = 0;
-	if (sysExData[0] & 0x80) return false;
+	if (sysExData[0] & 0x80)
+		return false;
 
 	// decompress data from stream
 	sysExBuf[0]  = 0x41; sysExBuf[1] = 0x10; sysExBuf[2] = 0x16; sysExBuf[3] = 0x12; sysExBuf[4] = 0x5;
@@ -113,7 +115,7 @@
 		crc -= sysExBuf[cnt];
 	sysExBuf[14] = crc & 0x7F;					// crc
 	_midiDrv->sysEx(sysExBuf, 15);
-	g_system->delayMillis (5);
+	g_system->delayMillis(5);
 	return true;
 }
 

Index: musicbase.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- musicbase.cpp	1 Jan 2005 16:09:22 -0000	1.22
+++ musicbase.cpp	10 Jan 2005 22:06:18 -0000	1.23
@@ -22,6 +22,7 @@
 #include "sky/music/musicbase.h"
 #include "sky/disk.h"
 #include "common/util.h"
+#include "common/system.h"
 
 namespace Sky {
 

Index: musicbase.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- musicbase.h	1 Jan 2005 16:09:22 -0000	1.15
+++ musicbase.h	10 Jan 2005 22:06:18 -0000	1.16
@@ -24,7 +24,7 @@
 
 #include "stdafx.h"
 #include "common/scummsys.h"
-#include "common/system.h"
+#include "common/mutex.h"
 
 class OSystem;
 
@@ -77,7 +77,7 @@
 	uint32 _aktTime;
 	Actions _onNextPoll;
 	ChannelBase *_channels[10];
-	OSystem::MutexRef _mutex;
+	Common::MutexRef _mutex;
 	
 	virtual void setupPointers(void) = 0;
 	virtual void setupChannels(uint8 *channelData) = 0;





More information about the Scummvm-git-logs mailing list