[Scummvm-cvs-logs] SF.net SVN: scummvm:[47419] scummvm/trunk/engines/sci/sound/drivers

[waltervn at users.sourceforge.net]

Revision: 47419
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47419&view=rev
Author:   waltervn
Date:     2010-01-21 16:28:09 +0000 (Thu, 21 Jan 2010)

Log Message:
-----------
SCI: Cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/drivers/midi.cpp
    scummvm/trunk/engines/sci/sound/drivers/mididriver.h

Modified: scummvm/trunk/engines/sci/sound/drivers/midi.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/midi.cpp	2010-01-21 16:27:29 UTC (rev 47418)
+++ scummvm/trunk/engines/sci/sound/drivers/midi.cpp	2010-01-21 16:28:09 UTC (rev 47419)
@@ -100,7 +100,7 @@
 	int _masterVolume;
 
 	byte _reverbConfig[kReverbConfigNr][3];
-	Channel _channels[16];	
+	Channel _channels[16];
 	uint8 _percussionMap[128];
 	int8 _keyShift[128];
 	int8 _volAdjust[128];
@@ -620,8 +620,9 @@
 	if (size > pos && ((0x100 * *(data + pos) + *(data + pos + 1)) == 0xabcd)) {
 		patches = 96;
 		pos += 2 + 8 * 48;
-	} else
+	} else {
 		patches = 48;
+	}
 
 	debugC(kDebugLevelSound, "[MT32-to-GM] %d MT-32 Patches detected", patches);
 	debugC(kDebugLevelSound, "[MT32-to-GM] %d MT-32 Memory Timbres", memtimbres);

Modified: scummvm/trunk/engines/sci/sound/drivers/mididriver.h
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/mididriver.h	2010-01-21 16:27:29 UTC (rev 47418)
+++ scummvm/trunk/engines/sci/sound/drivers/mididriver.h	2010-01-21 16:28:09 UTC (rev 47419)
@@ -95,7 +95,7 @@
 
 	virtual int getVolume() {
 		return _driver ? _driver->property(MIDI_PROP_MASTER_VOLUME, 0xffff) : 0;
- 	}
+	}
 
 	virtual byte getReverb() { return _reverb; }
 	virtual void setReverb(byte reverb) { _reverb = reverb; }


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