[Scummvm-cvs-logs] SF.net SVN: scummvm: [22413] scummvm/trunk/sound

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Fri May 12 05:18:56 CEST 2006


Revision: 22413
Author:   eriktorbjorn
Date:     2006-05-12 05:03:36 -0700 (Fri, 12 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22413&view=rev

Log Message:
-----------
Whitespace changes. (Oh dear, now *I'm* forcing myself to large re-compiles.)

Modified Paths:
--------------
    scummvm/trunk/sound/mididrv.h
    scummvm/trunk/sound/mpu401.cpp
    scummvm/trunk/sound/mpu401.h
Modified: scummvm/trunk/sound/mididrv.h
===================================================================
--- scummvm/trunk/sound/mididrv.h	2006-05-12 10:29:58 UTC (rev 22412)
+++ scummvm/trunk/sound/mididrv.h	2006-05-12 12:03:36 UTC (rev 22413)
@@ -218,16 +218,16 @@
 
 	// Control Change messages
 	virtual void controlChange(byte control, byte value) = 0;
-	virtual void modulationWheel(byte value) { controlChange (1, value); }
-	virtual void volume(byte value) { controlChange (7, value); }
-	virtual void panPosition(byte value) { controlChange (10, value); }
+	virtual void modulationWheel(byte value) { controlChange(1, value); }
+	virtual void volume(byte value) { controlChange(7, value); }
+	virtual void panPosition(byte value) { controlChange(10, value); }
 	virtual void pitchBendFactor(byte value) = 0;
-	virtual void detune(byte value) { controlChange (17, value); }
+	virtual void detune(byte value) { controlChange(17, value); }
 	virtual void priority(byte value) { }
-	virtual void sustain(bool value) { controlChange (64, value ? 1 : 0); }
-	virtual void effectLevel(byte value) { controlChange (91, value); }
-	virtual void chorusLevel(byte value) { controlChange (93, value); }
-	virtual void allNotesOff() { controlChange (123, 0); }
+	virtual void sustain(bool value) { controlChange(64, value ? 1 : 0); }
+	virtual void effectLevel(byte value) { controlChange(91, value); }
+	virtual void chorusLevel(byte value) { controlChange(93, value); }
+	virtual void allNotesOff() { controlChange(123, 0); }
 
 	// SysEx messages
 	virtual void sysEx_customInstrument(uint32 type, const byte *instr) = 0;

Modified: scummvm/trunk/sound/mpu401.cpp
===================================================================
--- scummvm/trunk/sound/mpu401.cpp	2006-05-12 10:29:58 UTC (rev 22412)
+++ scummvm/trunk/sound/mpu401.cpp	2006-05-12 12:03:36 UTC (rev 22413)
@@ -40,11 +40,11 @@
 	return _owner;
 }
 
-void MidiChannel_MPU401::send (uint32 b) {
+void MidiChannel_MPU401::send(uint32 b) {
 	_owner->send (b & 0xFFFFFFF0 | (_channel & 0xF));
 }
 
-void MidiChannel_MPU401::noteOff (byte note) {
+void MidiChannel_MPU401::noteOff(byte note) {
 	_owner->send(note << 8 | 0x80 | _channel);
 }
 
@@ -81,20 +81,20 @@
 		"Driver already open"
 	};
 
-	if ((uint) error_code >= ARRAYSIZE(midi_errors))
+	if ((uint)error_code >= ARRAYSIZE(midi_errors))
 		return "Unknown Error";
 	return midi_errors[error_code];
 }
 
 MidiDriver_MPU401::MidiDriver_MPU401() :
 	MidiDriver(),
-	_timer_proc (0),
-	_channel_mask (0xFFFF) // Permit all 16 channels by default
+	_timer_proc(0),
+	_channel_mask(0xFFFF) // Permit all 16 channels by default
 {
 
 	uint i;
 	for (i = 0; i < ARRAYSIZE(_midi_channels); ++i) {
-		_midi_channels [i].init (this, i);
+		_midi_channels[i].init(this, i);
 	}
 }
 
@@ -106,7 +106,7 @@
 		send (0x7B << 8 | 0xB0 | i);
 }
 
-uint32 MidiDriver_MPU401::property (int prop, uint32 param) {
+uint32 MidiDriver_MPU401::property(int prop, uint32 param) {
 	switch (prop) {
 		case PROP_CHANNEL_MASK:
 			_channel_mask = param & 0xFFFF;

Modified: scummvm/trunk/sound/mpu401.h
===================================================================
--- scummvm/trunk/sound/mpu401.h	2006-05-12 10:29:58 UTC (rev 22412)
+++ scummvm/trunk/sound/mpu401.h	2006-05-12 12:03:36 UTC (rev 22413)
@@ -46,23 +46,23 @@
 	byte getNumber() { return _channel; }
 	void release() { _allocated = false; }
 
-	void send (uint32 b);
+	void send(uint32 b);
 
 	// Regular messages
-	void noteOff (byte note);
-	void noteOn (byte note, byte velocity);
-	void programChange (byte program);
-	void pitchBend (int16 bend);
+	void noteOff(byte note);
+	void noteOn(byte note, byte velocity);
+	void programChange(byte program);
+	void pitchBend(int16 bend);
 
 	// Control Change messages
-	void controlChange (byte control, byte value);
-	void pitchBendFactor (byte value);
+	void controlChange(byte control, byte value);
+	void pitchBendFactor(byte value);
 
 	// SysEx messages
-	void sysEx_customInstrument (uint32 type, const byte *instr);
+	void sysEx_customInstrument(uint32 type, const byte *instr);
 
 	// Only to be called by the owner
-	void init (MidiDriver *owner, byte channel);
+	void init(MidiDriver *owner, byte channel);
 	bool allocate();
 };
 
@@ -70,7 +70,7 @@
 
 class MidiDriver_MPU401 : public MidiDriver {
 private:
-	MidiChannel_MPU401 _midi_channels [16];
+	MidiChannel_MPU401 _midi_channels[16];
 	Common::Timer::TimerProc _timer_proc;
 	uint16 _channel_mask;
 
@@ -83,7 +83,7 @@
 	uint32 property(int prop, uint32 param);
 
 	MidiChannel *allocateChannel();
-	MidiChannel *getPercussionChannel() { return &_midi_channels [9]; }
+	MidiChannel *getPercussionChannel() { return &_midi_channels[9]; }
 };
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list