[Scummvm-cvs-logs] CVS: scummvm/backends/midi ym2612.cpp,1.4,1.5

[Max Horn]

Update of /cvsroot/scummvm/scummvm/backends/midi
In directory sc8-pr-cvs1:/tmp/cvs-serv637

Modified Files:
	ym2612.cpp 
Log Message:
oops - that happesn if you incorrectly re-apply a broken patch =)

Index: ym2612.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/ym2612.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ym2612.cpp	6 Oct 2003 01:24:22 -0000	1.4
+++ ym2612.cpp	6 Oct 2003 01:25:24 -0000	1.5
@@ -280,25 +280,25 @@
 	}
 	_attackTime = (int32) value; // 1 ÉÃ == (1 << 12)
 
-	r = _specifiedDecayRate / _owner->_rate;
+	r = _specifiedDecayRate;
 	if (r != 0) {
 		r = r * 2 + (keyscaleTable[freq/262205] >> (3-_keyScale));
 		if (r >= 64)
 			r = 63;
 	}
 	value = (double) powtbl[(r&3) << 7] * (0x10 << (r>>2)) / 31;
-	_decayRate = (int32) value;
+	_decayRate = (int32) value / _owner->_rate;
 
-	r = _specifiedSustainRate / _owner->_rate;
+	r = _specifiedSustainRate;
 	if (r != 0) {
 		r = r * 2 + (keyscaleTable[freq/262205] >> (3-_keyScale));
 		if (r >= 64)
 			r = 63;
 	}
 	value = (double) powtbl[(r&3) << 7] * (0x10 << (r>>2)) / 31;
-	_sustainRate = (int32) value;
+	_sustainRate = (int32) value / _owner->_rate;
 
-	r = _specifiedReleaseRate / _owner->_rate;
+	r = _specifiedReleaseRate;
 	if (r != 0) {
 		r = r * 2 + 1;		// ¤³¤Î¥¿¥¤¥ß¥ó¥°¤ÇÎɤ¤¤Î¤«¤ï¤«¤é¤ó
 		r = r * 2 + (keyscaleTable[freq/262205] >> (3-_keyScale));
@@ -307,7 +307,7 @@
 			r = 63;
 	}
 	value = (double) powtbl[(r&3) << 7] * (0x10 << (r>>2)) / 31;
-	_releaseRate = (int32) value;
+	_releaseRate = (int32) value / _owner->_rate;
 }
 
 int Operator2612::nextTick(uint16 rate, int phaseShift) {