Formatting changes / consistency

svn-id: r36304

6 files changed, 3 insertions, 65 deletions

diff --git a/engines/sky/music/adlibchannel.cpp b/engines/sky/music/adlibchannel.cpp
index 588057a7c8..52c5a397b3 100644
--- a/engines/sky/music/adlibchannel.cpp
+++ b/engines/sky/music/adlibchannel.cpp
@@ -84,7 +84,6 @@ AdlibChannel::~AdlibChannel(void) {
 }
 
 bool AdlibChannel::isActive(void) {
-
 	return _channelData.channelActive;
 }
 
@@ -97,7 +96,6 @@ void AdlibChannel::updateVolume(uint16 pVolume) {
 	by all instances of the class.
 */
 void AdlibChannel::setRegister(uint8 regNum, uint8 value) {
-
 	if (_adlibRegMirror[regNum] != value) {
 		OPLWriteReg (_opl, regNum, value);
 		_adlibRegMirror[regNum] = value;
@@ -105,7 +103,6 @@ void AdlibChannel::setRegister(uint8 regNum, uint8 value) {
 }
 
 void AdlibChannel::stopNote(void) {
-
 	if (_channelData.note & 0x20) {
 		_channelData.note &= ~0x20;
 		setRegister(0xB0 | _channelData.adlibChannelNumber, _channelData.note);
@@ -129,7 +126,6 @@ int32 AdlibChannel::getNextEventTime(void) {
 }
 
 uint8 AdlibChannel::process(uint16 aktTime) {
-
 	if (!_channelData.channelActive) {
 		return 0;
 	}
@@ -190,7 +186,6 @@ uint8 AdlibChannel::process(uint16 aktTime) {
 }
 
 void AdlibChannel::setupInstrument(uint8 opcode) {
-
 	uint16 nextNote;
 	if (_channelData.tremoVibro) {
 		uint8 newInstrument = _instrumentMap[opcode];
@@ -211,7 +206,6 @@ void AdlibChannel::setupInstrument(uint8 opcode) {
 }
 
 void AdlibChannel::setupChannelVolume(uint8 volume) {
-
 	uint8 resultOp;
 	uint32 resVol = ((volume + 1) * (_channelData.instrumentData->totOutLev_Op2 + 1)) << 1;
 	resVol &= 0xFFFF;
@@ -233,7 +227,6 @@ void AdlibChannel::setupChannelVolume(uint8 volume) {
 }
 
 void AdlibChannel::adlibSetupInstrument(void) {
-
 	setRegister(0x60 | _channelData.adlibReg1, _channelData.instrumentData->ad_Op1);
 	setRegister(0x60 | _channelData.adlibReg2, _channelData.instrumentData->ad_Op2);
 	setRegister(0x80 | _channelData.adlibReg1, _channelData.instrumentData->sr_Op1);
@@ -246,7 +239,6 @@ void AdlibChannel::adlibSetupInstrument(void) {
 }
 
 uint16 AdlibChannel::getNextNote(uint8 param) {
-
 	int16 freqIndex = ((int16)_channelData.freqOffset) - 0x40;
 	if (freqIndex >= 0x3F)
 		freqIndex++;
@@ -264,20 +256,17 @@ uint16 AdlibChannel::getNextNote(uint8 param) {
 //- command 90h routines
 
 void AdlibChannel::com90_caseNoteOff(void) {
-
 	if (_musicData[_channelData.eventDataPtr] == _channelData.lastCommand)
 		stopNote();
 	_channelData.eventDataPtr++;
 }
 
 void AdlibChannel::com90_stopChannel(void) {
-
 	stopNote();
 	_channelData.channelActive = false;
 }
 
 void AdlibChannel::com90_setupInstrument(void) {
-
 	_channelData.channelVolume = 0x7F;
 	_channelData.freqOffset = 0x40;
 	_channelData.assignedInstrument = _musicData[_channelData.eventDataPtr];
@@ -291,7 +280,6 @@ uint8 AdlibChannel::com90_updateTempo(void) {
 }
 
 void AdlibChannel::com90_getFreqOffset(void) {
-
 	_channelData.freqOffset = _musicData[_channelData.eventDataPtr++];
 	if (_channelData.note & 0x20) {
 		uint16 nextNote = getNextNote(
@@ -303,27 +291,22 @@ void AdlibChannel::com90_getFreqOffset(void) {
 }
 
 void AdlibChannel::com90_getChannelVolume(void) {
-
 	_channelData.channelVolume = _musicData[_channelData.eventDataPtr++];
 }
 
 void AdlibChannel::com90_getTremoVibro(void) {
-
 	_channelData.tremoVibro = _musicData[_channelData.eventDataPtr++];
 }
 
 void AdlibChannel::com90_loopMusic(void) {
-
 	_channelData.eventDataPtr = _channelData.loopPoint;
 }
 
 void AdlibChannel::com90_keyOff(void) {
-
 	stopNote();
 }
 
 void AdlibChannel::com90_setLoopPoint(void) {
-
 	_channelData.loopPoint = _channelData.eventDataPtr;
 }
 
diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp
index 4434f4cd68..77852786fd 100644
--- a/engines/sky/music/adlibmusic.cpp
+++ b/engines/sky/music/adlibmusic.cpp
@@ -33,9 +33,7 @@
 
 namespace Sky {
 
-AdlibMusic::AdlibMusic(Audio::Mixer *pMixer, Disk *pDisk)
-	: MusicBase(pDisk) {
-
+AdlibMusic::AdlibMusic(Audio::Mixer *pMixer, Disk *pDisk) : MusicBase(pDisk) {
 	_driverFileBase = 60202;
 	_mixer = pMixer;
 	_sampleRate = pMixer->getOutputRate();
@@ -46,13 +44,11 @@ AdlibMusic::AdlibMusic(Audio::Mixer *pMixer, Disk *pDisk)
 }
 
 AdlibMusic::~AdlibMusic(void) {
-
 	OPLDestroy(_opl);
 	_mixer->stopHandle(_soundHandle);
 }
 
 int AdlibMusic::readBuffer(int16 *data, const int numSamples) {
-
 	if (_musicData == NULL) {
 		// no music loaded
 		memset(data, 0, numSamples * sizeof(int16));
@@ -81,7 +77,6 @@ int AdlibMusic::readBuffer(int16 *data, const int numSamples) {
 }
 
 void AdlibMusic::setupPointers(void) {
-
 	if (SkyEngine::_systemVars.gameVersion == 109) {
 		// disk demo uses a different adlib driver version, some offsets have changed
 		//_musicDataLoc = (_musicData[0x11CC] << 8) | _musicData[0x11CB];
@@ -100,7 +95,6 @@ void AdlibMusic::setupPointers(void) {
 }
 
 void AdlibMusic::setupChannels(uint8 *channelData) {
-
 	_numberOfChannels = channelData[0];
 	channelData++;
 	for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) {
@@ -110,7 +104,6 @@ void AdlibMusic::setupChannels(uint8 *channelData) {
 }
 
 void AdlibMusic::startDriver(void) {
-
 	uint16 cnt = 0;
 	while (_initSequence[cnt] || _initSequence[cnt + 1]) {
 		OPLWriteReg (_opl, _initSequence[cnt], _initSequence[cnt + 1]);
diff --git a/engines/sky/music/gmchannel.cpp b/engines/sky/music/gmchannel.cpp
index fc35fed391..97ac2ebc28 100644
--- a/engines/sky/music/gmchannel.cpp
+++ b/engines/sky/music/gmchannel.cpp
@@ -30,7 +30,6 @@
 namespace Sky {
 
 GmChannel::GmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, const byte *pInstMap, const byte *veloTab) {
-
 	_musicData = pMusicData;
 	_midiDrv = pMidiDrv;
 	_channelData.midiChannelNumber = 0;
@@ -54,7 +53,6 @@ bool GmChannel::isActive(void) {
 }
 
 void GmChannel::updateVolume(uint16 pVolume) {
-
 	_musicVolume = pVolume;
 	if (_musicVolume > 0)
 		_musicVolume = (_musicVolume * 2) / 3 + 43;
@@ -64,7 +62,6 @@ void GmChannel::updateVolume(uint16 pVolume) {
 }
 
 void GmChannel::stopNote(void) {
-
 	// All Notes Off
 	_midiDrv->send((0xB0 | _channelData.midiChannelNumber) | 0x7B00 | 0 | 0x79000000);
 	// Reset the Pitch Wheel. See bug #1016556.
@@ -72,7 +69,6 @@ void GmChannel::stopNote(void) {
 }
 
 int32 GmChannel::getNextEventTime(void) {
-
 	int32 retV = 0;
 	uint8 cnt, lVal = 0;
 	for (cnt = 0; cnt < 4; cnt++) {
@@ -89,7 +85,6 @@ int32 GmChannel::getNextEventTime(void) {
 }
 
 uint8 GmChannel::process(uint16 aktTime) {
-
 	if (!_channelData.channelActive)
 		return 0;
 
@@ -145,13 +140,11 @@ uint8 GmChannel::process(uint16 aktTime) {
 //- command 90h routines
 
 void GmChannel::com90_caseNoteOff(void) {
-
 	_midiDrv->send((0x90 | _channelData.midiChannelNumber) | (_musicData[_channelData.eventDataPtr] << 8));
 	_channelData.eventDataPtr++;
 }
 
 void GmChannel::com90_stopChannel(void) {
-
 	stopNote();
 	_channelData.channelActive = false;
 }
@@ -169,41 +162,34 @@ uint8 GmChannel::com90_updateTempo(void) {
 }
 
 void GmChannel::com90_getPitch(void) {
-
 	_midiDrv->send((0xE0 | _channelData.midiChannelNumber) | 0 | (_musicData[_channelData.eventDataPtr] << 16));
 	_channelData.eventDataPtr++;
 }
 
 void GmChannel::com90_getChannelVolume(void) {
-
 	_currentChannelVolume = _musicData[_channelData.eventDataPtr++];
 	uint8 newVol = (uint8)((_currentChannelVolume * _musicVolume) >> 7);
 	_midiDrv->send((0xB0 | _channelData.midiChannelNumber) | 0x700 | (newVol << 16));
 }
 
 void GmChannel::com90_loopMusic(void) {
-
 	_channelData.eventDataPtr = _channelData.loopPoint;
 }
 
 void GmChannel::com90_keyOff(void) {
-
 	_midiDrv->send((0x90 | _channelData.midiChannelNumber) | (_channelData.note << 8) | 0);
 }
 
 void GmChannel::com90_setLoopPoint(void) {
-
 	_channelData.loopPoint = _channelData.eventDataPtr;
 }
 
 void GmChannel::com90_getChannelPanValue(void) {
-
 	_midiDrv->send((0xB0 | _channelData.midiChannelNumber) | 0x0A00 | (_musicData[_channelData.eventDataPtr] << 16));
 	_channelData.eventDataPtr++;
 }
 
 void GmChannel::com90_getChannelControl(void) {
-
 	uint8 conNum = _musicData[_channelData.eventDataPtr++];
 	uint8 conDat = _musicData[_channelData.eventDataPtr++];
 	_midiDrv->send((0xB0 | _channelData.midiChannelNumber) | (conNum << 8) | (conDat << 16));
diff --git a/engines/sky/music/gmmusic.cpp b/engines/sky/music/gmmusic.cpp
index 2a1e8dcc1d..46832a8255 100644
--- a/engines/sky/music/gmmusic.cpp
+++ b/engines/sky/music/gmmusic.cpp
@@ -33,13 +33,10 @@
 namespace Sky {
 
 void GmMusic::passTimerFunc(void *param) {
-
 	((GmMusic*)param)->timerCall();
 }
 
-GmMusic::GmMusic(MidiDriver *pMidiDrv, Disk *pDisk)
-	: MusicBase(pDisk) {
-
+GmMusic::GmMusic(MidiDriver *pMidiDrv, Disk *pDisk) : MusicBase(pDisk) {
 	_driverFileBase = 60200;
 	_midiDrv = pMidiDrv;
 	int midiRes = _midiDrv->open();
@@ -50,7 +47,6 @@ GmMusic::GmMusic(MidiDriver *pMidiDrv, Disk *pDisk)
 }
 
 GmMusic::~GmMusic(void) {
-
 	_midiDrv->setTimerCallback(NULL, NULL);
 	if (_currentMusic)
 		stopMusic();
@@ -64,7 +60,6 @@ GmMusic::~GmMusic(void) {
 }
 
 void GmMusic::setVolume(uint16 param) {
-
 	_musicVolume = param;
 	for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++)
 		_channels[cnt]->updateVolume(_musicVolume);
@@ -81,7 +76,6 @@ void GmMusic::timerCall(void) {
 }
 
 void GmMusic::setupPointers(void) {
-
 	if (SkyEngine::_systemVars.gameVersion == 109) {
 		_musicDataLoc = READ_LE_UINT16(_musicData + 0x79B);
 		_sysExSequence = _musicData + 0x1EF2;
@@ -92,7 +86,6 @@ void GmMusic::setupPointers(void) {
 }
 
 void GmMusic::setupChannels(uint8 *channelData) {
-
 	_numberOfChannels = channelData[0];
 	channelData++;
 	for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) {
diff --git a/engines/sky/music/mt32music.cpp b/engines/sky/music/mt32music.cpp
index aa784e7437..816a77fa9a 100644
--- a/engines/sky/music/mt32music.cpp
+++ b/engines/sky/music/mt32music.cpp
@@ -33,13 +33,10 @@
 namespace Sky {
 
 void MT32Music::passTimerFunc(void *param) {
-
 	((MT32Music*)param)->timerCall();
 }
 
-MT32Music::MT32Music(MidiDriver *pMidiDrv, Disk *pDisk)
-	: MusicBase(pDisk) {
-
+MT32Music::MT32Music(MidiDriver *pMidiDrv, Disk *pDisk) : MusicBase(pDisk) {
 	_driverFileBase = 60200;
 	_midiDrv = pMidiDrv;
 	int midiRes = _midiDrv->open();
@@ -50,7 +47,6 @@ MT32Music::MT32Music(MidiDriver *pMidiDrv, Disk *pDisk)
 }
 
 MT32Music::~MT32Music(void) {
-
 	_midiDrv->close();
 	_midiDrv->setTimerCallback(NULL, NULL);
 	delete _midiDrv;
@@ -78,13 +74,11 @@ void MT32Music::setVolume(uint16 volume) {
 }
 
 void MT32Music::setupPointers(void) {
-
 	_musicDataLoc = READ_LE_UINT16(_musicData + 0x7DC);
 	_sysExSequence = READ_LE_UINT16(_musicData + 0x7E0) + _musicData;
 }
 
 void MT32Music::setupChannels(uint8 *channelData) {
-
 	_numberOfChannels = channelData[0];
 	channelData++;
 	for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) {
@@ -95,7 +89,6 @@ void MT32Music::setupChannels(uint8 *channelData) {
 }
 
 bool MT32Music::processPatchSysEx(uint8 *sysExData) {
-
 	uint8 sysExBuf[15];
 	uint8 crc = 0;
 	if (sysExData[0] & 0x80)
@@ -125,7 +118,6 @@ bool MT32Music::processPatchSysEx(uint8 *sysExData) {
 }
 
 void MT32Music::startDriver(void) {
-
 	// setup timbres and patches using SysEx data
 	uint8* sysExData = _sysExSequence;
 	uint8 timbreNum = sysExData[0];
diff --git a/engines/sky/music/musicbase.cpp b/engines/sky/music/musicbase.cpp
index 9bf7a62a21..17d022e774 100644
--- a/engines/sky/music/musicbase.cpp
+++ b/engines/sky/music/musicbase.cpp
@@ -31,7 +31,6 @@
 namespace Sky {
 
 MusicBase::MusicBase(Disk *pDisk) {
-
 	_musicData = NULL;
 	_skyDisk = pDisk;
 	_currentMusic = 0;
@@ -40,14 +39,12 @@ MusicBase::MusicBase(Disk *pDisk) {
 }
 
 MusicBase::~MusicBase(void) {
-
 	stopMusic();
 	if (_musicData)
 		free(_musicData);
 }
 
 void MusicBase::loadSection(uint8 pSection) {
-
 	_mutex.lock();
 	if (_currentMusic)
 		stopMusicInternal();
@@ -67,7 +64,6 @@ void MusicBase::loadSection(uint8 pSection) {
 }
 
 bool MusicBase::musicIsPlaying(void) {
-
 	for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++)
 		if (_channels[cnt]->isActive())
 			return true;
@@ -75,21 +71,18 @@ bool MusicBase::musicIsPlaying(void) {
 }
 
 void MusicBase::stopMusic(void) {
-
 	_mutex.lock();
 	stopMusicInternal();
 	_mutex.unlock();
 }
 
 void MusicBase::stopMusicInternal(void) {
-
 	for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++)
 		delete _channels[cnt];
 	_numberOfChannels = 0;
 }
 
 void MusicBase::updateTempo(void) {
-
 	uint16 tempoMul = _musicTempo0 * _musicTempo1;
 	uint16 divisor = 0x4446390/ 23864;
 	_tempo = (tempoMul / divisor) << 16;
@@ -97,7 +90,6 @@ void MusicBase::updateTempo(void) {
 }
 
 void MusicBase::loadNewMusic(void) {
-
 	uint16 musicPos;
 	if (_onNextPoll.musicToProcess > _musicData[_musicDataLoc]) {
 		error("Music %d requested but doesn't exist in file.", _onNextPoll.musicToProcess);
@@ -123,7 +115,6 @@ void MusicBase::loadNewMusic(void) {
 }
 
 void MusicBase::pollMusic(void) {
-
 	_mutex.lock();
 	uint8 newTempo;
 	if (_onNextPoll.musicToProcess != _currentMusic)