[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.81,2.82 imuse_player.cpp,2.22,2.23

Jamieson Christian jamieson630 at users.sourceforge.net
Fri Aug 15 23:38:04 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv11678/scummvm/scumm

Modified Files:
	imuse.cpp imuse_player.cpp 
Log Message:
Fixed transpose/detune computations

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.81
retrieving revision 2.82
diff -u -d -r2.81 -r2.82
--- imuse.cpp	15 Aug 2003 01:18:19 -0000	2.81
+++ imuse.cpp	16 Aug 2003 06:17:27 -0000	2.82
@@ -1419,11 +1419,11 @@
 }
 
 void Part::set_transpose(int8 transpose) {
-	_transpose_eff = transpose_clamp((_transpose = transpose) + _player->getTranspose(), -12, 12);
+	_transpose_eff = transpose_clamp((_transpose = transpose) + _player->getTranspose(), -24, 24);
 	if (_mc) {
 		_mc->pitchBend(clamp(_pitchbend +
-						(_detune_eff * 64 / 12) +
-						(_transpose_eff * 8192 / 12), -8192, 8191));
+						(_detune_eff * /*64*/82 / _pitchbend_factor) +
+						(_transpose_eff * 8192 / _pitchbend_factor), -8192, 8191));
 	}
 }
 

Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.22
retrieving revision 2.23
diff -u -d -r2.22 -r2.23
--- imuse_player.cpp	14 Aug 2003 08:26:59 -0000	2.22
+++ imuse_player.cpp	16 Aug 2003 06:17:27 -0000	2.23
@@ -652,7 +652,7 @@
 	if (b > 24 || b < -24 || relative > 1)
 		return -1;
 	if (relative)
-		b = transpose_clamp(_transpose + b, -7, 7);
+		b = transpose_clamp(_transpose + b, -24, 24);
 
 	_transpose = b;
 





More information about the Scummvm-git-logs mailing list