SCUMM: Adapt iMuse code formatting to our standards.

9 files changed, 134 insertions, 134 deletions

diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp
index 9fb6087e53..451721cf70 100644
--- a/engines/scumm/imuse/imuse.cpp
+++ b/engines/scumm/imuse/imuse.cpp
@@ -44,31 +44,31 @@ namespace Scumm {
 ////////////////////////////////////////
 
 IMuseInternal::IMuseInternal() :
-_native_mt32(false),
-_enable_gs(false),
-_sc55(false),
-_midi_adlib(NULL),
-_midi_native(NULL),
-_sysex(NULL),
-_paused(false),
-_initialized(false),
-_tempoFactor(0),
-_player_limit(ARRAYSIZE(_players)),
-_recycle_players(false),
-_queue_end(0),
-_queue_pos(0),
-_queue_sound(0),
-_queue_adding(0),
-_queue_marker(0),
-_queue_cleared(0),
-_master_volume(0),
-_music_volume(0),
-_trigger_count(0),
-_snm_trigger_index(0),
-_pcSpeaker(false) {
-	memset(_channel_volume,0,sizeof(_channel_volume));
-	memset(_channel_volume_eff,0,sizeof(_channel_volume_eff));
-	memset(_volchan_table,0,sizeof(_volchan_table));
+	_native_mt32(false),
+	_enable_gs(false),
+	_sc55(false),
+	_midi_adlib(NULL),
+	_midi_native(NULL),
+	_sysex(NULL),
+	_paused(false),
+	_initialized(false),
+	_tempoFactor(0),
+	_player_limit(ARRAYSIZE(_players)),
+	_recycle_players(false),
+	_queue_end(0),
+	_queue_pos(0),
+	_queue_sound(0),
+	_queue_adding(0),
+	_queue_marker(0),
+	_queue_cleared(0),
+	_master_volume(0),
+	_music_volume(0),
+	_trigger_count(0),
+	_snm_trigger_index(0),
+	_pcSpeaker(false) {
+	memset(_channel_volume, 0, sizeof(_channel_volume));
+	memset(_channel_volume_eff, 0, sizeof(_channel_volume_eff));
+	memset(_volchan_table, 0, sizeof(_volchan_table));
 }
 
 IMuseInternal::~IMuseInternal() {
@@ -120,7 +120,7 @@ byte *IMuseInternal::findStartOfSound(int sound, int ct) {
 
 	// Check for old-style headers first, like 'RO'
 	int trFlag = (kMThd | kFORM);
-	if (ptr[0] == 'R' && ptr[1] == 'O'&& ptr[2] != 'L')
+	if (ptr[0] == 'R' && ptr[1] == 'O' && ptr[2] != 'L')
 		return ct == trFlag ? ptr : 0;
 	if (ptr[4] == 'S' && ptr[5] == 'O')
 		return ct == trFlag ? ptr + 4 : 0;
@@ -154,22 +154,22 @@ bool IMuseInternal::isMT32(int sound) {
 
 	uint32 tag = READ_BE_UINT32(ptr);
 	switch (tag) {
-	case MKTAG('A','D','L',' '):
-	case MKTAG('A','S','F','X'): // Special AD class for old AdLib sound effects
-	case MKTAG('S','P','K',' '):
+	case MKTAG('A', 'D', 'L', ' '):
+	case MKTAG('A', 'S', 'F', 'X'): // Special AD class for old AdLib sound effects
+	case MKTAG('S', 'P', 'K', ' '):
 		return false;
 
-	case MKTAG('A','M','I',' '):
-	case MKTAG('R','O','L',' '):
+	case MKTAG('A', 'M', 'I', ' '):
+	case MKTAG('R', 'O', 'L', ' '):
 		return true;
 
-	case MKTAG('M','A','C',' '):	// Occurs in the Mac version of FOA and MI2
+	case MKTAG('M', 'A', 'C', ' '): // Occurs in the Mac version of FOA and MI2
 		return true;
 
-	case MKTAG('G','M','D',' '):
+	case MKTAG('G', 'M', 'D', ' '):
 		return false;
 
-	case MKTAG('M','I','D','I'):	// Occurs in Sam & Max
+	case MKTAG('M', 'I', 'D', 'I'): // Occurs in Sam & Max
 		// HE games use Roland music
 		if (ptr[8] == 'H' && ptr[9] == 'S')
 			return true;
@@ -196,20 +196,20 @@ bool IMuseInternal::isMIDI(int sound) {
 
 	uint32 tag = READ_BE_UINT32(ptr);
 	switch (tag) {
-	case MKTAG('A','D','L',' '):
-	case MKTAG('A','S','F','X'): // Special AD class for old AdLib sound effects
-	case MKTAG('S','P','K',' '):
+	case MKTAG('A', 'D', 'L', ' '):
+	case MKTAG('A', 'S', 'F', 'X'): // Special AD class for old AdLib sound effects
+	case MKTAG('S', 'P', 'K', ' '):
 		return false;
 
-	case MKTAG('A','M','I',' '):
-	case MKTAG('R','O','L',' '):
+	case MKTAG('A', 'M', 'I', ' '):
+	case MKTAG('R', 'O', 'L', ' '):
 		return true;
 
-	case MKTAG('M','A','C',' '):	// Occurs in the Mac version of FOA and MI2
+	case MKTAG('M', 'A', 'C', ' '): // Occurs in the Mac version of FOA and MI2
 		return true;
 
-	case MKTAG('G','M','D',' '):
-	case MKTAG('M','I','D','I'):	// Occurs in Sam & Max
+	case MKTAG('G', 'M', 'D', ' '):
+	case MKTAG('M', 'I', 'D', 'I'): // Occurs in Sam & Max
 		return true;
 	}
 
@@ -382,7 +382,8 @@ int IMuseInternal::save_or_load(Serializer *ser, ScummEngine *scumm) {
 	for (i = 0; i < ARRAYSIZE(_parts); ++i)
 		_parts[i].saveLoadWithSerializer(ser);
 
-	{ // Load/save the instrument definitions, which were revamped with V11.
+	{
+		// Load/save the instrument definitions, which were revamped with V11.
 		Part *part = &_parts[0];
 		if (ser->getVersion() >= VER(11)) {
 			for (i = ARRAYSIZE(_parts); i; --i, ++part) {
@@ -527,7 +528,7 @@ void IMuseInternal::stopAllSounds() {
 
 int IMuseInternal::getSoundStatus(int sound) const {
 	Common::StackLock lock(_mutex, "IMuseInternal::getSoundStatus()");
-	return getSoundStatus_internal (sound, true);
+	return getSoundStatus_internal(sound, true);
 }
 
 int IMuseInternal::getMusicTimer() {
@@ -570,7 +571,7 @@ bool IMuseInternal::startSound_internal(int sound, int offset) {
 	int i;
 	ImTrigger *trigger = _snm_triggers;
 	for (i = ARRAYSIZE(_snm_triggers); i; --i, ++trigger) {
-		if (trigger->sound && trigger->id && trigger->command[0] == 8 && trigger->command[1] == sound && getSoundStatus_internal (trigger->sound,true))
+		if (trigger->sound && trigger->id && trigger->command[0] == 8 && trigger->command[1] == sound && getSoundStatus_internal(trigger->sound, true))
 			return false;
 	}
 
@@ -668,9 +669,7 @@ int IMuseInternal::getSoundStatus_internal(int sound, bool ignoreFadeouts) const
 	return (sound == -1) ? 0 : get_queue_sound_status(sound);
 }
 
-int32 IMuseInternal::doCommand_internal
-	(int a, int b, int c, int d, int e, int f, int g, int h)
-{
+int32 IMuseInternal::doCommand_internal(int a, int b, int c, int d, int e, int f, int g, int h) {
 	int args[8];
 	args[0] = a;
 	args[1] = b;
@@ -738,7 +737,7 @@ int32 IMuseInternal::doCommand_internal(int numargs, int a[]) {
 			}
 			return -1;
 		case 13:
-			return getSoundStatus_internal (a[1], true);
+			return getSoundStatus_internal(a[1], true);
 		case 14:
 			// Sam and Max: Parameter fade
 			player = findActivePlayer(a[1]);
@@ -784,8 +783,7 @@ int32 IMuseInternal::doCommand_internal(int numargs, int a[]) {
 				a[0] = 0;
 				for (i = 0; i < ARRAYSIZE(_snm_triggers); ++i) {
 					if (_snm_triggers[i].sound == a[1] && _snm_triggers[i].id &&
-					   (a[3] == -1 || _snm_triggers[i].id == a[3]))
-					{
+					        (a[3] == -1 || _snm_triggers[i].id == a[3])) {
 						++a[0];
 					}
 				}
@@ -1007,9 +1005,9 @@ int IMuseInternal::get_queue_sound_status(int sound) const {
 		i = (i + 1) % ARRAYSIZE(_cmd_queue);
 	}
 
-	for (i = 0; i < ARRAYSIZE (_deferredCommands); ++i) {
+	for (i = 0; i < ARRAYSIZE(_deferredCommands); ++i) {
 		if (_deferredCommands[i].time_left && _deferredCommands[i].a == 8 &&
-			_deferredCommands[i].b == sound) {
+		        _deferredCommands[i].b == sound) {
 			return 2;
 		}
 	}
@@ -1218,7 +1216,7 @@ int32 IMuseInternal::ImSetTrigger(int sound, int id, int a, int b, int c, int d,
 	// NOTE: We ONLY do this if the sound that will trigger the command is actually
 	// playing. Otherwise, there's a problem when exiting and re-entering the
 	// Bumpusville mansion. Ref Bug #780918.
-	if (trig->command[0] == 8 && getSoundStatus_internal(trig->command[1],true) && getSoundStatus_internal(sound,true))
+	if (trig->command[0] == 8 && getSoundStatus_internal(trig->command[1], true) && getSoundStatus_internal(sound, true))
 		stopSound_internal(trig->command[1]);
 	return 0;
 }
@@ -1251,8 +1249,7 @@ int32 IMuseInternal::ImFireAllTriggers(int sound) {
 	return (count > 0) ? 0 : -1;
 }
 
-int IMuseInternal::set_channel_volume(uint chan, uint vol)
-{
+int IMuseInternal::set_channel_volume(uint chan, uint vol) {
 	if (chan >= 8 || vol > 127)
 		return -1;
 
@@ -1432,7 +1429,7 @@ void IMuseInternal::initMT32(MidiDriver *midi) {
 	// Display a welcome message on MT-32 displays.
 	memcpy(&buffer[0], "\x41\x10\x16\x12\x20\x00\x00", 7);
 	memcpy(&buffer[7], "                    ", 20);
-	memcpy(buffer + 7 +(20 - len) / 2, info, len);
+	memcpy(buffer + 7 + (20 - len) / 2, info, len);
 	byte checksum = 0;
 	for (int i = 4; i < 27; ++i)
 		checksum -= buffer[i];
@@ -1478,9 +1475,9 @@ void IMuseInternal::initGM(MidiDriver *midi) {
 
 			// Set Channels 1-16 to SC-55 Map, then CM-64/32L Variation
 			for (i = 0; i < 16; ++i) {
-				midi->send((  127 << 16) | (0  << 8) | (0xB0 | i));
-				midi->send((  1   << 16) | (32 << 8) | (0xB0 | i));
-				midi->send((  0   << 16) | (0  << 8) | (0xC0 | i));
+				midi->send((127 << 16) | (0  << 8) | (0xB0 | i));
+				midi->send((1   << 16) | (32 << 8) | (0xB0 | i));
+				midi->send((0   << 16) | (0  << 8) | (0xC0 | i));
 			}
 			debug(2, "GS Program Change: CM-64/32L Map Selected");
 
@@ -1501,7 +1498,7 @@ void IMuseInternal::initGM(MidiDriver *midi) {
 		// Set Channels 1-16 Reverb to 64, which is the
 		// equivalent of MT-32 default Reverb Level 5
 		for (i = 0; i < 16; ++i)
-			midi->send((  64   << 16) | (91 << 8) | (0xB0 | i));
+			midi->send((64   << 16) | (91 << 8) | (0xB0 | i));
 		debug(2, "GM Controller 91 Change: Channels 1-16 Reverb Level is 64");
 
 		// Set Channels 1-16 Pitch Bend Sensitivity to
@@ -1642,8 +1639,8 @@ void IMuseInternal::reallocateMidiChannels(MidiDriver *midi) {
 		hipart = NULL;
 		for (i = 32, part = _parts; i; i--, part++) {
 			if (part->_player && part->_player->getMidiDriver() == midi &&
-						!part->_percussion && part->_on &&
-						!part->_mc && part->_pri_eff >= hipri) {
+			        !part->_percussion && part->_on &&
+			        !part->_mc && part->_pri_eff >= hipri) {
 				hipri = part->_pri_eff;
 				hipart = part;
 			}
diff --git a/engines/scumm/imuse/imuse.h b/engines/scumm/imuse/imuse.h
index 73f0bb9a90..23449e470b 100644
--- a/engines/scumm/imuse/imuse.h
+++ b/engines/scumm/imuse/imuse.h
@@ -37,7 +37,7 @@ class Player;
 class ScummEngine;
 class Serializer;
 
-typedef void (*sysexfunc) (Player *, const byte *, uint16);
+typedef void (*sysexfunc)(Player *, const byte *, uint16);
 
 /**
  * iMuse implementation interface.
@@ -67,7 +67,7 @@ public:
 	virtual int32 doCommand(int numargs, int args[]) = 0;
 	virtual int clear_queue() = 0;
 	virtual uint32 property(int prop, uint32 value) = 0;
-	virtual void addSysexHandler (byte mfgID, sysexfunc handler) = 0;
+	virtual void addSysexHandler(byte mfgID, sysexfunc handler) = 0;
 
 public:
 	virtual void startSoundWithNoteOffset(int sound, int offset) = 0;
diff --git a/engines/scumm/imuse/imuse_internal.h b/engines/scumm/imuse/imuse_internal.h
index 4ab25907a4..3b0d36e119 100644
--- a/engines/scumm/imuse/imuse_internal.h
+++ b/engines/scumm/imuse/imuse_internal.h
@@ -135,7 +135,7 @@ struct ImTrigger {
 	int sound;
 	byte id;
 	uint16 expire;
-	int command [8];
+	int command[8];
 	ImTrigger() { memset(this, 0, sizeof(ImTrigger)); }
 };
 
@@ -153,12 +153,12 @@ struct CommandQueue {
 //////////////////////////////////////////////////
 
 class Player : public MidiDriver_BASE {
-/*
- * External SysEx handler functions shall each be defined in
- * a separate file. This header file shall be included at the
- * top of the file immediately following this special #define:
- * #define SYSEX_CALLBACK_FUNCTION nameOfHandlerFunction
- */
+	/*
+	 * External SysEx handler functions shall each be defined in
+	 * a separate file. This header file shall be included at the
+	 * top of the file immediately following this special #define:
+	 * #define SYSEX_CALLBACK_FUNCTION nameOfHandlerFunction
+	 */
 #ifdef SYSEX_CALLBACK_FUNCTION
 	friend void SYSEX_CALLBACK_FUNCTION(Player *, const byte *, uint16);
 #endif
@@ -244,7 +244,7 @@ public:
 	void clear();
 	void clearLoop();
 	void fixAfterLoad();
-	Part * getActivePart(uint8 part);
+	Part *getActivePart(uint8 part);
 	uint getBeatIndex();
 	int8 getDetune() const { return _detune; }
 	byte getEffectiveVolume() const { return _vol_eff; }
@@ -252,7 +252,7 @@ public:
 	MidiDriver *getMidiDriver() const { return _midi; }
 	int getParam(int param, byte chan);
 	int8 getPan() const { return _pan; }
-	Part * getPart(uint8 part);
+	Part *getPart(uint8 part);
 	byte getPriority() const { return _priority; }
 	uint getTicksPerBeat() const { return TICKS_PER_BEAT; }
 	int8 getTranspose() const { return _transpose; }
@@ -376,12 +376,12 @@ class IMuseInternal : public IMuse {
 	friend class Player;
 	friend struct Part;
 
-/*
- * External SysEx handler functions shall each be defined in
- * a separate file. This header file shall be included at the
- * top of the file immediately following this special #define:
- * #define SYSEX_CALLBACK_FUNCTION nameOfHandlerFunction
- */
+	/*
+	 * External SysEx handler functions shall each be defined in
+	 * a separate file. This header file shall be included at the
+	 * top of the file immediately following this special #define:
+	 * #define SYSEX_CALLBACK_FUNCTION nameOfHandlerFunction
+	 */
 #ifdef SYSEX_CALLBACK_FUNCTION
 	friend void SYSEX_CALLBACK_FUNCTION(Player *, const byte *, uint16);
 #endif
@@ -451,8 +451,8 @@ protected:
 	enum ChunkType {
 		kMThd = 1,
 		kFORM = 2,
-		kMDhd = 4,	// Used in MI2 and INDY4. Contain certain start parameters (priority, volume, etc. ) for the player.
-		kMDpg = 8	// These chunks exist in DOTT and SAMNMAX. They don't get processed, however.
+		kMDhd = 4,  // Used in MI2 and INDY4. Contain certain start parameters (priority, volume, etc. ) for the player.
+		kMDpg = 8   // These chunks exist in DOTT and SAMNMAX. They don't get processed, however.
 	};
 
 	byte *findStartOfSound(int sound, int ct = (kMThd | kFORM));
diff --git a/engines/scumm/imuse/imuse_part.cpp b/engines/scumm/imuse/imuse_part.cpp
index 53627f6a4a..73e7704469 100644
--- a/engines/scumm/imuse/imuse_part.cpp
+++ b/engines/scumm/imuse/imuse_part.cpp
@@ -193,7 +193,7 @@ void Part::set_onoff(bool on) {
 	}
 }
 
-void Part::set_instrument(byte * data) {
+void Part::set_instrument(byte *data) {
 	if (_se->_pcSpeaker)
 		_instrument.pcspk(data);
 	else
@@ -238,7 +238,7 @@ void Part::noteOn(byte note, byte velocity) {
 		// should be implemented as a class static var. As it is, using
 		// a function level static var in most cases is arcane and evil.
 		static byte prev_vol_eff = 128;
-		if (_vol_eff != prev_vol_eff){
+		if (_vol_eff != prev_vol_eff) {
 			mc->volume(_vol_eff);
 			prev_vol_eff = _vol_eff;
 		}
diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp
index 07c793a4cb..73be2174cd 100644
--- a/engines/scumm/imuse/imuse_player.cpp
+++ b/engines/scumm/imuse/imuse_player.cpp
@@ -79,7 +79,7 @@ Player::Player() :
 	_isMT32(false),
 	_isMIDI(false),
 	_se(0),
-	_vol_chan(0){
+	_vol_chan(0) {
 }
 
 Player::~Player() {
@@ -133,7 +133,7 @@ bool Player::isFadingOut() const {
 	int i;
 	for (i = 0; i < ARRAYSIZE(_parameterFaders); ++i) {
 		if (_parameterFaders[i].param == ParameterFader::pfVolume &&
-						_parameterFaders[i].end == 0) {
+		        _parameterFaders[i].end == 0) {
 			return true;
 		}
 	}
@@ -401,13 +401,13 @@ void Player::sysEx(const byte *p, uint16 len) {
 
 	if (!_scanning) {
 		for (a = 0; a < len + 1 && a < 19; ++a) {
-			sprintf((char *)&buf[a*3], " %02X", p[a]);
+			sprintf((char *)&buf[a * 3], " %02X", p[a]);
 		} // next for
 		if (a < len + 1) {
-			buf[a*3] = buf[a*3+1] = buf[a*3+2] = '.';
+			buf[a * 3] = buf[a * 3 + 1] = buf[a * 3 + 2] = '.';
 			++a;
 		} // end if
-		buf[a*3] = '\0';
+		buf[a * 3] = '\0';
 		debugC(DEBUG_IMUSE, "[%02d] SysEx:%s", _id, buf);
 	}
 
@@ -816,7 +816,7 @@ int Player::query_part_param(int param, byte chan) {
 				return part->_vol;
 			case 16:
 // FIXME: Need to know where this occurs...
-error("Trying to cast instrument (%d, %d) -- please tell Fingolfin", param, chan);
+				error("Trying to cast instrument (%d, %d) -- please tell Fingolfin", param, chan);
 // In old versions of the code, this used to return part->_program.
 // This was changed in revision 2.29 of imuse.cpp (where this code used
 // to reside).
@@ -847,9 +847,8 @@ void Player::onTimer() {
 	uint beat_index = target_tick / TICKS_PER_BEAT + 1;
 	uint tick_index = target_tick % TICKS_PER_BEAT;
 
-	if (_loop_counter &&(beat_index > _loop_from_beat ||
-	   (beat_index == _loop_from_beat && tick_index >= _loop_from_tick)))
-	{
+	if (_loop_counter && (beat_index > _loop_from_beat ||
+	    (beat_index == _loop_from_beat && tick_index >= _loop_from_tick))) {
 		_loop_counter--;
 		jump(_track_index, _loop_to_beat, _loop_to_tick);
 	}
@@ -893,15 +892,15 @@ int Player::addParameterFader(int param, int target, int time) {
 //		target = target * 128 / 100;
 		break;
 
-	case 127:
-		{ // FIXME? I *think* this clears all parameter faders.
-			ParameterFader *ptr = &_parameterFaders[0];
-			int i;
-			for (i = ARRAYSIZE(_parameterFaders); i; --i, ++ptr)
-				ptr->param = 0;
-			return 0;
-		}
-		break;
+	case 127: {
+		// FIXME? I *think* this clears all parameter faders.
+		ParameterFader *ptr = &_parameterFaders[0];
+		int i;
+		for (i = ARRAYSIZE(_parameterFaders); i; --i, ++ptr)
+			ptr->param = 0;
+		return 0;
+	}
+	break;
 
 	default:
 		debug(0, "Player::addParameterFader(%d, %d, %d): Unknown parameter", param, target, time);
@@ -1087,7 +1086,7 @@ void Player::saveLoadWithSerializer(Serializer *ser) {
 	}
 	ser->saveLoadEntries(this, playerEntries);
 	ser->saveLoadArrayOf(_parameterFaders, ARRAYSIZE(_parameterFaders),
-						sizeof(ParameterFader), parameterFaderEntries);
+	                     sizeof(ParameterFader), parameterFaderEntries);
 	return;
 }
 
diff --git a/engines/scumm/imuse/instrument.cpp b/engines/scumm/imuse/instrument.cpp
index 581f378655..11bb4e7605 100644
--- a/engines/scumm/imuse/instrument.cpp
+++ b/engines/scumm/imuse/instrument.cpp
@@ -114,14 +114,15 @@ roland_to_gm_map[] = {
 //	{ "trickle4  ", ??? }
 };
 
+// This emulates the percussion bank setup LEC used with the MT-32,
+// where notes 24 - 34 were assigned instruments without reverb.
+// It also fixes problems on GS devices that map sounds to these
+// notes by default.
 const byte Instrument::_gmRhythmMap[35] = {
-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	  0,  0,  0,  0,  0,  0,  0,  0, 36, 37, 38, 39, 40, 41, 66, 47,
-	 65, 48, 56};
-       // This emulates the percussion bank setup LEC used with the MT-32,
-       // where notes 24 - 34 were assigned instruments without reverb.
-       // It also fixes problems on GS devices that map sounds to these
-       // notes by default.
+	0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+	0,  0,  0,  0,  0,  0,  0,  0, 36, 37, 38, 39, 40, 41, 66, 47,
+	65, 48, 56
+};
 
 class Instrument_Program : public InstrumentInternal {
 private:
@@ -136,15 +137,16 @@ public:
 	void copy_to(Instrument *dest) { dest->program(_program, _mt32); }
 	bool is_valid() {
 		return (_program < 128) &&
-			((_native_mt32 == _mt32) || _native_mt32
-				? (MidiDriver::_gmToMt32[_program] < 128)
-				: (MidiDriver::_mt32ToGm[_program] < 128)); }
+		       ((_native_mt32 == _mt32) || _native_mt32
+		        ? (MidiDriver::_gmToMt32[_program] < 128)
+		        : (MidiDriver::_mt32ToGm[_program] < 128));
+	}
 };
 
 class Instrument_AdLib : public InstrumentInternal {
 private:
 
-#include "common/pack-start.h"	// START STRUCT PACKING
+#include "common/pack-start.h"  // START STRUCT PACKING
 
 	struct AdLibInstrument {
 		byte flags_1;
@@ -159,13 +161,17 @@ private:
 		byte waveform_2;
 		byte feedback;
 		byte flags_a;
-		struct { byte a,b,c,d,e,f,g,h; } extra_a;
+		struct {
+			byte a, b, c, d, e, f, g, h;
+		} extra_a;
 		byte flags_b;
-		struct { byte a,b,c,d,e,f,g,h; } extra_b;
+		struct {
+			byte a, b, c, d, e, f, g, h;
+		} extra_b;
 		byte duration;
 	} PACKED_STRUCT;
 
-#include "common/pack-end.h"	// END STRUCT PACKING
+#include "common/pack-end.h"    // END STRUCT PACKING
 
 	AdLibInstrument _instrument;
 
@@ -181,7 +187,7 @@ public:
 class Instrument_Roland : public InstrumentInternal {
 private:
 
-#include "common/pack-start.h"	// START STRUCT PACKING
+#include "common/pack-start.h"  // START STRUCT PACKING
 
 	struct RolandInstrument {
 		byte roland_id;
@@ -242,11 +248,11 @@ private:
 		byte checksum;
 	} PACKED_STRUCT;
 
-#include "common/pack-end.h"	// END STRUCT PACKING
+#include "common/pack-end.h"    // END STRUCT PACKING
 
 	RolandInstrument _instrument;
 
-	char _instrument_name [11];
+	char _instrument_name[11];
 
 	uint8 getEquivalentGM();
 
@@ -320,7 +326,7 @@ void Instrument::pcspk(const byte *instrument) {
 	_instrument = new Instrument_PcSpk(instrument);
 }
 
-void Instrument::saveOrLoad (Serializer *s) {
+void Instrument::saveOrLoad(Serializer *s) {
 	if (s->isSaving()) {
 		s->saveByte(_type);
 		if (_instrument)
@@ -357,8 +363,8 @@ void Instrument::saveOrLoad (Serializer *s) {
 ////////////////////////////////////////
 
 Instrument_Program::Instrument_Program(byte program, bool mt32) :
-_program (program),
-_mt32 (mt32) {
+	_program(program),
+	_mt32(mt32) {
 	if (program > 127)
 		_program = 255;
 }
@@ -437,7 +443,7 @@ Instrument_Roland::Instrument_Roland(const byte *data) {
 Instrument_Roland::Instrument_Roland(Serializer *s) {
 	_instrument_name[0] = '\0';
 	if (!s->isSaving())
-		saveOrLoad (s);
+		saveOrLoad(s);
 	else
 		memset(&_instrument, 0, sizeof(_instrument));
 }
diff --git a/engines/scumm/imuse/instrument.h b/engines/scumm/imuse/instrument.h
index 34f955518e..a855c64155 100644
--- a/engines/scumm/imuse/instrument.h
+++ b/engines/scumm/imuse/instrument.h
@@ -55,7 +55,7 @@ public:
 		itPcSpk = 4
 	};
 
-	Instrument() : _type (0), _instrument (0) { }
+	Instrument() : _type(0), _instrument(0) { }
 	~Instrument() { delete _instrument; }
 	static void nativeMT32(bool native);
 	static const byte _gmRhythmMap[35];
diff --git a/engines/scumm/imuse/sysex_samnmax.cpp b/engines/scumm/imuse/sysex_samnmax.cpp
index 4c4219e7bb..a4f525da56 100644
--- a/engines/scumm/imuse/sysex_samnmax.cpp
+++ b/engines/scumm/imuse/sysex_samnmax.cpp
@@ -53,8 +53,7 @@ void sysexHandler_SamNMax(Player *player, const byte *msg, uint16 len) {
 		// something magical is supposed to happen....
 		for (a = 0; a < ARRAYSIZE(se->_snm_triggers); ++a) {
 			if (se->_snm_triggers[a].sound == player->_id &&
-			    se->_snm_triggers[a].id == *p)
-			{
+			        se->_snm_triggers[a].id == *p) {
 				se->_snm_triggers[a].sound = se->_snm_triggers[a].id = 0;
 				se->doCommand(8, se->_snm_triggers[a].command);
 				break;
diff --git a/engines/scumm/imuse/sysex_scumm.cpp b/engines/scumm/imuse/sysex_scumm.cpp
index 98b8ed934e..ec64800b20 100644
--- a/engines/scumm/imuse/sysex_scumm.cpp
+++ b/engines/scumm/imuse/sysex_scumm.cpp
@@ -75,7 +75,7 @@ void sysexHandler_Scumm(Player *player, const byte *msg, uint16 len) {
 			part->set_onoff(p[2] & 0x01);
 			part->effectLevel((p[2] & 0x02) ? 127 : 0);
 			part->set_pri((p[3] << 4) | p[4]);
-			part->volume((p[5] & 0x0F) << 4 |(p[6] & 0x0F));
+			part->volume((p[5] & 0x0F) << 4 | (p[6] & 0x0F));
 			part->set_pan((p[7] & 0x0F) << 4 | (p[8] & 0x0F));
 			part->_percussion = player->_isMIDI ? ((p[9] & 0x08) > 0) : false;
 			part->set_transpose((p[9] & 0x0F) << 4 | (p[10] & 0x0F));
@@ -93,7 +93,7 @@ void sysexHandler_Scumm(Player *player, const byte *msg, uint16 len) {
 				// cases, a regular program change message always seems to follow
 				// anyway.
 				if (player->_isMIDI) {
-					part->_instrument.program((p[15] & 0x0F) << 4 |(p[16] & 0x0F), player->_isMT32);
+					part->_instrument.program((p[15] & 0x0F) << 4 | (p[16] & 0x0F), player->_isMT32);
 				} else if (se->_pcSpeaker) {
 					// FIXME/HACK: This is only needed here, since when we use the following line:
 					// se->copyGlobalInstrument((p[15] & 0x0F) << 4 |(p[16] & 0x0F), &part->_instrument);
@@ -125,7 +125,7 @@ void sysexHandler_Scumm(Player *player, const byte *msg, uint16 len) {
 			if (len == 62 || len == 48) {
 				player->decode_sysex_bytes(p, buf, len - 2);
 				part->set_instrument((byte *)buf);
-			} else { 
+			} else {
 				part->programChange(254); // Must be invalid, but not 255 (which is reserved)
 			}
 		}
@@ -194,10 +194,9 @@ void sysexHandler_Scumm(Player *player, const byte *msg, uint16 len) {
 
 	case 80: // Loop
 		player->decode_sysex_bytes(p + 1, buf, len - 1);
-		player->setLoop
-			(READ_BE_UINT16(buf), READ_BE_UINT16(buf + 2),
-			 READ_BE_UINT16(buf + 4), READ_BE_UINT16(buf + 6),
-			 READ_BE_UINT16(buf + 8));
+		player->setLoop(READ_BE_UINT16(buf), READ_BE_UINT16(buf + 2),
+		                READ_BE_UINT16(buf + 4), READ_BE_UINT16(buf + 6),
+		                READ_BE_UINT16(buf + 8));
 		break;
 
 	case 81: // End loop