[Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,1.8,1.9 gmchannel.cpp,1.9,1.10 musicbase.cpp,1.13,1.14

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Tue Sep 23 23:29:03 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky/music
In directory sc8-pr-cvs1:/tmp/cvs-serv9659/music

Modified Files:
	adlibchannel.cpp gmchannel.cpp musicbase.cpp 
Log Message:
Whitespace changes


Index: adlibchannel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibchannel.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- adlibchannel.cpp	13 Jul 2003 06:04:11 -0000	1.8
+++ adlibchannel.cpp	24 Sep 2003 06:28:04 -0000	1.9
@@ -138,30 +138,30 @@
 				// dummy opcode
 			} else if (opcode >= 0x90) {
 				switch (opcode&0xF) {
-					case 0: com90_caseNoteOff(); break;
-					case 1: com90_stopChannel(); break;
-					case 2: com90_setupInstrument(); break;
-					case 3: 
-						returnVal = com90_updateTempo();
-						break;
-					case 5: com90_getFreqOffset(); break;
-					case 6: com90_getChannelVolume(); break;
-					case 7: com90_getTremoVibro(); break;
-					case 8: com90_rewindMusic(); break;
-					case 9: com90_keyOff(); break;
-					case 12: com90_setStartOfData(); break;
-					case 4: //com90_dummy();
-					case 10: //com90_error();
-					case 11: //com90_doLodsb();
-					case 13: //com90_do_two_Lodsb();
-						error("SkyChannel: dummy music routine 0x%02X was called",opcode);
-						_channelData.channelActive = 0;
-						break;
-					default:
-						// these opcodes aren't implemented in original music driver
-						error("SkyChannel: Not existant routine 0x%02X was called",opcode);
-						_channelData.channelActive = 0;
-						break;
+				case 0: com90_caseNoteOff(); break;
+				case 1: com90_stopChannel(); break;
+				case 2: com90_setupInstrument(); break;
+				case 3: 
+					returnVal = com90_updateTempo();
+					break;
+				case 5: com90_getFreqOffset(); break;
+				case 6: com90_getChannelVolume(); break;
+				case 7: com90_getTremoVibro(); break;
+				case 8: com90_rewindMusic(); break;
+				case 9: com90_keyOff(); break;
+				case 12: com90_setStartOfData(); break;
+				case 4: //com90_dummy();
+				case 10: //com90_error();
+				case 11: //com90_doLodsb();
+				case 13: //com90_do_two_Lodsb();
+					error("SkyChannel: dummy music routine 0x%02X was called",opcode);
+					_channelData.channelActive = 0;
+					break;
+				default:
+					// these opcodes aren't implemented in original music driver
+					error("SkyChannel: Not existant routine 0x%02X was called",opcode);
+					_channelData.channelActive = 0;
+					break;
 				}
 			} else {
 				// new adlib channel assignment

Index: gmchannel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmchannel.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gmchannel.cpp	10 Sep 2003 12:45:42 -0000	1.9
+++ gmchannel.cpp	24 Sep 2003 06:28:04 -0000	1.10
@@ -93,30 +93,30 @@
 				// dummy opcode
 			} else if (opcode >= 0x90) {
 				switch (opcode&0xF) {
-					case 0: com90_caseNoteOff(); break;
-					case 1: com90_stopChannel(); break;
-					case 2: com90_setupInstrument(); break;
-					case 3: 
-						returnVal = com90_updateTempo();
-						break;
-					case 5: com90_getPitch(); break;
-					case 6: com90_getChannelVolume(); break;
-					case 8: com90_rewindMusic(); break;
-					case 9: com90_keyOff(); break;
-					case 11: com90_getChannelPanValue(); break;
-					case 12: com90_setStartOfData(); break;
-					case 13: com90_getChannelControl(); break;
-					case 4: //com90_dummy();
-					case 7: //com90_skipTremoVibro();
-					case 10: //com90_error();
-						error("SkyChannel: dummy music routine 0x%02X was called",opcode);
-						_channelData.channelActive = 0;
-						break;
-					default:
-						// these opcodes aren't implemented in original music driver
-						error("SkyChannel: Not existant routine 0x%02X was called",opcode);
-						_channelData.channelActive = 0;
-						break;
+				case 0: com90_caseNoteOff(); break;
+				case 1: com90_stopChannel(); break;
+				case 2: com90_setupInstrument(); break;
+				case 3: 
+					returnVal = com90_updateTempo();
+					break;
+				case 5: com90_getPitch(); break;
+				case 6: com90_getChannelVolume(); break;
+				case 8: com90_rewindMusic(); break;
+				case 9: com90_keyOff(); break;
+				case 11: com90_getChannelPanValue(); break;
+				case 12: com90_setStartOfData(); break;
+				case 13: com90_getChannelControl(); break;
+				case 4: //com90_dummy();
+				case 7: //com90_skipTremoVibro();
+				case 10: //com90_error();
+					error("SkyChannel: dummy music routine 0x%02X was called",opcode);
+					_channelData.channelActive = 0;
+					break;
+				default:
+					// these opcodes aren't implemented in original music driver
+					error("SkyChannel: Not existant routine 0x%02X was called",opcode);
+					_channelData.channelActive = 0;
+					break;
 				}
 			} else {
 				// new midi channel assignment

Index: musicbase.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- musicbase.cpp	10 Sep 2003 12:40:41 -0000	1.13
+++ musicbase.cpp	24 Sep 2003 06:28:04 -0000	1.14
@@ -78,32 +78,32 @@
 		return ;
 	}
 	switch(command >> 8) {
-		case 0: 
-			debug(1,"SkyMusic: got call to startAdlibDriver(). Not necessary in this implementation.");
-			break;
-		case 1: 
-			debug(1,"SkyMusic: got call to stopDriver(). Not necessary in this implementation.");
-			break;
-		case 2:
-			debug(1,"SkyMusic: got call to SetTempo(). Tempo is fixed in this implementation.");
-			break;
-		case 3: 
-			debug(1,"SkyMusic: ignored direct call to driverPoll().");
-			break;
-		case 4: 
-			startMusic(command&0xFF);
-			break;
-		case 6:
-			reinitFM();
-			break;
-		case 7:
-			stopMusic();
-			break;
-		case 13: 
-			setFMVolume(command&0xFF); 
-			break;
-		default: 
-			debug(1,"musicCommand %d ignored.",command>>8);
+	case 0: 
+		debug(1,"SkyMusic: got call to startAdlibDriver(). Not necessary in this implementation.");
+		break;
+	case 1: 
+		debug(1,"SkyMusic: got call to stopDriver(). Not necessary in this implementation.");
+		break;
+	case 2:
+		debug(1,"SkyMusic: got call to SetTempo(). Tempo is fixed in this implementation.");
+		break;
+	case 3: 
+		debug(1,"SkyMusic: ignored direct call to driverPoll().");
+		break;
+	case 4: 
+		startMusic(command&0xFF);
+		break;
+	case 6:
+		reinitFM();
+		break;
+	case 7:
+		stopMusic();
+		break;
+	case 13: 
+		setFMVolume(command&0xFF); 
+		break;
+	default: 
+		debug(1,"musicCommand %d ignored.",command>>8);
 	}
 }
 





More information about the Scummvm-git-logs mailing list