[Scummvm-cvs-logs] CVS: scummvm/sound/softsynth adlib.cpp,1.4,1.5 emumidi.h,1.5,1.6 fluidsynth.cpp,1.5,1.6 mt32.cpp,1.14,1.15 ym2612.cpp,1.4,1.5

[Eugene Sandulenko]

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

Modified Files:
	adlib.cpp emumidi.h fluidsynth.cpp mt32.cpp ym2612.cpp 
Log Message:
Remove trailing whitespaces.


Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/adlib.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- adlib.cpp	10 May 2005 23:48:46 -0000	1.4
+++ adlib.cpp	30 Jul 2005 21:11:43 -0000	1.5
@@ -195,7 +195,7 @@
 	Struct11 _s11a;
 	Struct10 _s10b;
 	Struct11 _s11b;
-	
+
 	AdlibVoice() { memset(this, 0, sizeof(AdlibVoice)); }
 };
 
@@ -461,14 +461,14 @@
 };
 
 static const byte gm_percussion_lookup[128] = {
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 
-	0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0xFF, 0xFF, 0x17, 0x18, 0x19, 0x1A, 
-	0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x21, 0x22, 0x23, 0xFF, 0xFF, 
-	0x24, 0x25, 0xFF, 0xFF, 0xFF, 0x26, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C,
+	0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0xFF, 0xFF, 0x17, 0x18, 0x19, 0x1A,
+	0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x21, 0x22, 0x23, 0xFF, 0xFF,
+	0x24, 0x25, 0xFF, 0xFF, 0xFF, 0x26, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 };
 
 static byte lookup_table[64][32];
@@ -551,7 +551,7 @@
 	void send(byte channel, uint32 b); // Supports higher than channel 15
 	uint32 property(int prop, uint32 param);
 
-	void setPitchBendRange(byte channel, uint range); 
+	void setPitchBendRange(byte channel, uint range);
 	void sysEx_customInstrument(byte channel, uint32 type, byte *instr);
 
 	MidiChannel *allocateChannel();
@@ -798,7 +798,7 @@
 
 // MidiDriver method implementations
 
-MidiDriver_ADLIB::MidiDriver_ADLIB(Audio::Mixer *mixer) 
+MidiDriver_ADLIB::MidiDriver_ADLIB(Audio::Mixer *mixer)
 	: MidiDriver_Emulated(mixer) {
 	uint i;
 
@@ -865,7 +865,7 @@
 
 	// Turn off the OPL emulation
 //	YM3812Shutdown();
-	
+
 	free(_adlib_reg_cache);
 }
 
@@ -1308,7 +1308,7 @@
 	}
 
 	/* V3 games don't have note priorities, first comes wins. */
-	if (_game_SmallHeader) 
+	if (_game_SmallHeader)
 		return NULL;
 
 	if (best)

Index: emumidi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/emumidi.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- emumidi.h	24 Jun 2005 15:23:48 -0000	1.5
+++ emumidi.h	30 Jul 2005 21:11:43 -0000	1.6
@@ -46,10 +46,10 @@
 public:
 	MidiDriver_Emulated(Audio::Mixer *mixer) : _mixer(mixer) {
 		_isOpen = false;
-	
+
 		_timerProc = 0;
 		_timerParam = 0;
-	
+
 		_nextTick = 0;
 		_samplesPerTick = 0;
 
@@ -89,7 +89,7 @@
 				step = (_nextTick >> FIXP_SHIFT);
 
 			generateSamples(data, step);
-	
+
 			_nextTick -= step << FIXP_SHIFT;
 			if (!(_nextTick >> FIXP_SHIFT)) {
 				if (_timerProc)

Index: fluidsynth.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/fluidsynth.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fluidsynth.cpp	24 Jun 2005 15:23:48 -0000	1.5
+++ fluidsynth.cpp	30 Jul 2005 21:11:43 -0000	1.6
@@ -73,7 +73,7 @@
 	}
 
 	// It ought to be possible to get FluidSynth to generate samples at
-	// lower 
+	// lower
 
 	_outputRate = _mixer->getOutputRate();
 	if (_outputRate < 22050)

Index: mt32.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/mt32.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mt32.cpp	24 Jun 2005 15:23:48 -0000	1.14
+++ mt32.cpp	30 Jul 2005 21:11:43 -0000	1.15
@@ -238,7 +238,7 @@
 		return MERR_ALREADY_OPEN;
 
 	MidiDriver_Emulated::open();
-	
+
 	memset(&prop, 0, sizeof(prop));
 	prop.sampleRate = getRate();
 	prop.useReverb = true;
@@ -253,10 +253,10 @@
 	_synth = new MT32Emu::Synth();
 	_initialising = true;
 	const byte dummy_palette[] = {
-		0, 0, 0, 0, 
-		0, 0, 171, 0, 
-		0, 171, 0, 0, 
-		0, 171, 171, 0, 
+		0, 0, 0, 0,
+		0, 0, 171, 0,
+		0, 171, 0, 0,
+		0, 171, 171, 0,
 		171, 0, 0, 0
 	};
 
@@ -470,7 +470,7 @@
 
 MidiDriver *MidiDriver_MT32_create(Audio::Mixer *mixer) {
 	// HACK: It will stay here until engine plugin loader overhaul
-	if (ConfMan.hasKey("extrapath"))                                        
+	if (ConfMan.hasKey("extrapath"))
 		Common::File::addDefaultDirectory(ConfMan.get("extrapath"));
 	return new MidiDriver_MT32(mixer);
 }

Index: ym2612.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/ym2612.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ym2612.cpp	10 May 2005 23:48:46 -0000	1.4
+++ ym2612.cpp	30 Jul 2005 21:11:43 -0000	1.5
@@ -106,7 +106,7 @@
 	int _frequencyOffs;
 	int _frequency;
 	int _algorithm;
-	
+
 	int *_buffer;
 	int _buflen;