[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_internal.h,2.4,2.5 imuse_player.cpp,2.5,2.6

Jamieson Christian jamieson630 at users.sourceforge.net
Sat May 24 12:44:02 CEST 2003


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

Modified Files:
	imuse_internal.h imuse_player.cpp 
Log Message:
Removed more unnecessary code

Index: imuse_internal.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_internal.h,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -d -r2.4 -r2.5
--- imuse_internal.h	24 May 2003 19:20:52 -0000	2.4
+++ imuse_internal.h	24 May 2003 19:43:20 -0000	2.5
@@ -28,7 +28,7 @@
 
 // Unremark this statement to activate some of
 // the most common iMuse diagnostic messages.
-// #define IMUSE_DEBUG
+#define IMUSE_DEBUG
 
 struct HookDatas;
 struct ParameterFader;
@@ -208,7 +208,6 @@
 	int  query_part_param(int param, byte chan);
 	void turn_off_parts();
 	void play_active_notes();
-	void cancel_volume_fade();
 
 	void transitionParameters();
 

Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -d -r2.5 -r2.6
--- imuse_player.cpp	24 May 2003 19:20:52 -0000	2.5
+++ imuse_player.cpp	24 May 2003 19:43:20 -0000	2.6
@@ -144,7 +144,6 @@
 }
 
 void Player::clear() {
-	cancel_volume_fade();
 	uninit_parts();
 	_se->ImFireAllTriggers (_id);
 	_active = false;
@@ -202,16 +201,6 @@
 	}
 
 	_tempo_eff = (i << 16) / j;
-}
-
-void Player::cancel_volume_fade() {
-	int i;
-	for (i = 0; i < ARRAYSIZE(_parameterFaders); ++i) {
-		if (_parameterFaders[i].param == ParameterFader::pfVolume) {
-			_parameterFaders[i].param = 0;
-			break;
-		}
-	}
 }
 
 void Player::uninit_parts() {





More information about the Scummvm-git-logs mailing list