[Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.h,1.5,1.6 adlibmusic.cpp,1.12,1.13 gmchannel.cpp,1.10,1.11 gmchannel.h,1.5,1.6 gmmusic.cpp,1.12,1.13

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/sky/music
In directory sc8-pr-cvs1:/tmp/cvs-serv29746/music

Modified Files:
	adlibchannel.h adlibmusic.cpp gmchannel.cpp gmchannel.h 
	gmmusic.cpp 
Log Message:
Whitespace changes


Index: adlibchannel.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibchannel.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- adlibchannel.h	18 Sep 2003 02:07:18 -0000	1.5
+++ adlibchannel.h	1 Oct 2003 09:40:28 -0000	1.6
@@ -75,7 +75,7 @@
 	InstrumentStruct *_instruments;
 	uint16 *_frequenceTable;
 	uint8 *_instrumentMap;
-    uint8 *_registerTable, *_opOutputTable;
+	uint8 *_registerTable, *_opOutputTable;
 	uint8 *_adlibRegMirror;
 	//-                          normal subs
 	void setRegister(uint8 regNum, uint8 value);
@@ -84,7 +84,7 @@
 	void adlibSetupInstrument(void);
 	void setupInstrument(uint8 opcode);
 	void setupChannelVolume(uint8 volume);
-    //-                          Streamfunctions from Command90hTable
+	//-                          Streamfunctions from Command90hTable
 	void com90_caseNoteOff(void);       // 0
 	void com90_stopChannel(void);       // 1
 	void com90_setupInstrument(void);   // 2

Index: adlibmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- adlibmusic.cpp	18 Sep 2003 16:01:32 -0000	1.12
+++ adlibmusic.cpp	1 Oct 2003 09:40:28 -0000	1.13
@@ -31,7 +31,7 @@
 	: SkyMusicBase(pSkyDisk, system) {
 
 	_driverFileBase = 60202;
-    _mixer = pMixer;
+	_mixer = pMixer;
 	_sampleRate = pMixer->getOutputRate();
 
 	int env_bits = g_system->property(OSystem::PROP_GET_FMOPL_ENV_BITS, NULL);   

Index: gmchannel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmchannel.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gmchannel.cpp	24 Sep 2003 06:28:04 -0000	1.10
+++ gmchannel.cpp	1 Oct 2003 09:40:28 -0000	1.11
@@ -22,8 +22,8 @@
 #include "gmchannel.h"
 #include "common/util.h"
 
-SkyGmChannel::SkyGmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, byte *pInstMap, uint8 *veloTab)
-{
+SkyGmChannel::SkyGmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, byte *pInstMap, uint8 *veloTab) {
+
 	_musicData = pMusicData;
 	_midiDrv = pMidiDrv;
 	_channelData.midiChannelNumber = 0;
@@ -59,8 +59,8 @@
 	_midiDrv->send((0xB0 | _channelData.midiChannelNumber) | 0x7B00 | 0 | 0x79000000);
 }
 
-int32 SkyGmChannel::getNextEventTime(void)
-{
+int32 SkyGmChannel::getNextEventTime(void) {
+
 	int32 retV = 0; 
 	uint8 cnt, lVal;
 	for (cnt = 0; cnt < 4; cnt++) {

Index: gmchannel.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmchannel.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gmchannel.h	10 Sep 2003 12:40:41 -0000	1.5
+++ gmchannel.h	1 Oct 2003 09:40:28 -0000	1.6
@@ -57,7 +57,7 @@
 	void adlibSetupInstrument(void);
 	void setupInstrument(uint8 opcode);
 	void setupChannelVolume(uint8 volume);
-    //-                          Streamfunctions from Command90hTable
+	//-                          Streamfunctions from Command90hTable
 	void com90_caseNoteOff(void);        // 0
 	void com90_stopChannel(void);        // 1
 	void com90_setupInstrument(void);    // 2

Index: gmmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmmusic.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gmmusic.cpp	24 Sep 2003 09:32:38 -0000	1.12
+++ gmmusic.cpp	1 Oct 2003 09:40:28 -0000	1.13
@@ -31,7 +31,7 @@
 	: SkyMusicBase(pSkyDisk, system) {
 
 	_driverFileBase = 60200;
-    _midiDrv = pMidiDrv;
+	_midiDrv = pMidiDrv;
 	int midiRes = _midiDrv->open();
 	if (midiRes != 0) {
 		error("Can't open midi device. Errorcode: %d",midiRes);