[Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,1.19,1.20 adlibmusic.cpp,1.25,1.26 gmchannel.cpp,1.21,1.22 musicbase.cpp,1.24,1.25 musicbase.h,1.20,1.21

[Eugene Sandulenko]

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

Modified Files:
	adlibchannel.cpp adlibmusic.cpp gmchannel.cpp musicbase.cpp 
	musicbase.h 
Log Message:
Remove trailing whitespaces.


Index: adlibchannel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibchannel.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- adlibchannel.cpp	24 Jun 2005 15:23:45 -0000	1.19
+++ adlibchannel.cpp	30 Jul 2005 21:11:41 -0000	1.20
@@ -108,7 +108,7 @@
 }
 
 int32 AdlibChannel::getNextEventTime(void) {
-	int32 retV = 0; 
+	int32 retV = 0;
 	uint8 cnt, lVal = 0;
 	for (cnt = 0; cnt < 4; cnt++) {
 		lVal = _musicData[_channelData.eventDataPtr];
@@ -127,7 +127,7 @@
 	if (!_channelData.channelActive) {
 		return 0;
 	}
-	
+
 	uint8 returnVal = 0;
 
 	_channelData.nextEventTime -= aktTime;
@@ -143,7 +143,7 @@
 				case 0: com90_caseNoteOff(); break;
 				case 1: com90_stopChannel(); break;
 				case 2: com90_setupInstrument(); break;
-				case 3: 
+				case 3:
 					returnVal = com90_updateTempo();
 					break;
 				case 5: com90_getFreqOffset(); break;

Index: adlibmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- adlibmusic.cpp	10 May 2005 23:48:45 -0000	1.25
+++ adlibmusic.cpp	30 Jul 2005 21:11:41 -0000	1.26
@@ -28,11 +28,11 @@
 
 AdlibMusic::AdlibMusic(Audio::Mixer *pMixer, Disk *pDisk)
 	: MusicBase(pDisk) {
-	
+
 	_driverFileBase = 60202;
 	_mixer = pMixer;
 	_sampleRate = pMixer->getOutputRate();
-	
+
 	_opl = makeAdlibOPL(_sampleRate);
 
 	_mixer->setupPremix(this);
@@ -91,7 +91,7 @@
 		// disk demo uses a different adlib driver version, some offsets have changed
 		//_musicDataLoc = (_musicData[0x11CC] << 8) | _musicData[0x11CB];
 		//_initSequence = _musicData + 0xEC8;
-		
+
 		_musicDataLoc = READ_LE_UINT16(_musicData + 0x1200);
 		_initSequence = _musicData + 0xEFB;
 	} else if (SkyEngine::_systemVars.gameVersion == 267) {

Index: gmchannel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmchannel.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gmchannel.cpp	3 Apr 2005 22:01:28 -0000	1.21
+++ gmchannel.cpp	30 Jul 2005 21:11:42 -0000	1.22
@@ -67,7 +67,7 @@
 
 int32 GmChannel::getNextEventTime(void) {
 
-	int32 retV = 0; 
+	int32 retV = 0;
 	uint8 cnt, lVal = 0;
 	for (cnt = 0; cnt < 4; cnt++) {
 		lVal = _musicData[_channelData.eventDataPtr];
@@ -85,7 +85,7 @@
 
 	if (!_channelData.channelActive)
 		return 0;
-	
+
 	uint8 returnVal = 0;
 
 	_channelData.nextEventTime -= aktTime;
@@ -102,7 +102,7 @@
 				case 0: com90_caseNoteOff(); break;
 				case 1: com90_stopChannel(); break;
 				case 2: com90_setupInstrument(); break;
-				case 3: 
+				case 3:
 					returnVal = com90_updateTempo();
 					break;
 				case 5: com90_getPitch(); break;

Index: musicbase.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- musicbase.cpp	28 Jan 2005 22:05:48 -0000	1.24
+++ musicbase.cpp	30 Jul 2005 21:11:42 -0000	1.25
@@ -82,19 +82,19 @@
 		return ;
 	}
 	switch(command >> 8) {
-	case 0: 
+	case 0:
 		debug(1,"Music: got call to startAdlibDriver(). Not necessary in this implementation.");
 		break;
-	case 1: 
+	case 1:
 		debug(1,"Music: got call to stopDriver(). Not necessary in this implementation.");
 		break;
 	case 2:
 		debug(1,"Music: got call to SetTempo(). Tempo is fixed in this implementation.");
 		break;
-	case 3: 
+	case 3:
 		debug(1,"Music: ignored direct call to driverPoll().");
 		break;
-	case 4: 
+	case 4:
 		startMusic(command & 0xFF);
 		break;
 	case 6:
@@ -103,10 +103,10 @@
 	case 7:
 		stopMusic();
 		break;
-	case 13: 
-		setFMVolume(command & 0xFF); 
+	case 13:
+		setFMVolume(command & 0xFF);
 		break;
-	default: 
+	default:
 		debug(1,"musicCommand %d ignored.",command >> 8);
 	}
 }

Index: musicbase.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- musicbase.h	24 Jun 2005 15:23:45 -0000	1.20
+++ musicbase.h	30 Jul 2005 21:11:42 -0000	1.21
@@ -59,7 +59,7 @@
 	virtual void setVolume(uint8 volume) = 0;
 	uint8 giveVolume(void) { return (uint8)_musicVolume; };
 	uint8 giveCurrentMusic(void) { return _currentMusic; };
-	
+
 protected:
 
 	Disk *_skyDisk;
@@ -77,7 +77,7 @@
 	Actions _onNextPoll;
 	ChannelBase *_channels[10];
 	Common::Mutex _mutex;
-	
+
 	virtual void setupPointers(void) = 0;
 	virtual void setupChannels(uint8 *channelData) = 0;