[Scummvm-cvs-logs] CVS: scummvm/scumm instrument.cpp,2.33,2.34 imuse.cpp,2.132,2.133 imuse_player.cpp,2.49,2.50

Max Horn fingolfin at users.sourceforge.net
Wed May 25 12:40:49 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22315

Modified Files:
	instrument.cpp imuse.cpp imuse_player.cpp 
Log Message:
cleanup

Index: instrument.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/instrument.cpp,v
retrieving revision 2.33
retrieving revision 2.34
diff -u -d -r2.33 -r2.34
--- instrument.cpp	14 Apr 2005 19:23:21 -0000	2.33
+++ instrument.cpp	25 May 2005 19:39:07 -0000	2.34
@@ -134,7 +134,11 @@
 	void saveOrLoad (Serializer *s);
 	void send (MidiChannel *mc);
 	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)); }
+	bool is_valid() {
+		return (_program < 128) &&
+			((_native_mt32 == _mt32) || _native_mt32
+				? (MidiDriver::_gmToMt32[_program] < 128)
+				: (MidiDriver::_mt32ToGm[_program] < 128)); }
 };
 
 class Instrument_Adlib : public InstrumentInternal {

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.132
retrieving revision 2.133
diff -u -d -r2.132 -r2.133
--- imuse.cpp	25 May 2005 09:32:19 -0000	2.132
+++ imuse.cpp	25 May 2005 19:39:09 -0000	2.133
@@ -128,6 +128,8 @@
 
 	case MKID('AMI '):
 	case MKID('ROL '):
+		return true;
+
 	case MKID('MAC '):
 		return true;
 
@@ -163,9 +165,11 @@
 	case MKID('ASFX'): // Special AD class for old Adlib sound effects
 	case MKID('SPK '):
 		return false;
-		return false;
+
 	case MKID('AMI '):
 	case MKID('ROL '):
+		return true;
+
 	case MKID('MAC '):
 		return true;
 

Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.49
retrieving revision 2.50
diff -u -d -r2.49 -r2.50
--- imuse_player.cpp	25 May 2005 09:32:19 -0000	2.49
+++ imuse_player.cpp	25 May 2005 19:39:11 -0000	2.50
@@ -414,7 +414,7 @@
 				part->set_onoff(p[2] & 0x01);
 				part->set_pri (p[4]);
 				part->volume((p[5] & 0x0F) << 4 |(p[6] & 0x0F));
-				part->_percussion = _isMIDI ?((p[9] & 0x08) > 0) : false;
+				part->_percussion = _isMIDI ? ((p[9] & 0x08) > 0) : false;
 				if (part->_percussion) {
 					if (part->_mc) {
 						part->off();
@@ -469,7 +469,7 @@
 				part->set_instrument((byte *) buf);
 			} else {
 				// SPK tracks have len == 49 here, and are not supported
-				part->programChange(254); // Must be invalid, but not 255(which is reserved)
+				part->programChange(254); // Must be invalid, but not 255 (which is reserved)
 			}
 		}
 		break;





More information about the Scummvm-git-logs mailing list