[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.54,2.55 imuse_internal.h,2.3,2.4 imuse_player.cpp,2.4,2.5

[Jamieson Christian]

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

Modified Files:
	imuse.cpp imuse_internal.h imuse_player.cpp 
Log Message:
Various iMuse cleanup

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.54
retrieving revision 2.55
diff -u -d -r2.54 -r2.55
--- imuse.cpp	24 May 2003 01:20:50 -0000	2.54
+++ imuse.cpp	24 May 2003 19:20:51 -0000	2.55
@@ -28,10 +28,6 @@
 #include "common/util.h"
 #include "imuse_internal.h"
 
-// Unremark this statement to activate some of
-// the most common iMuse diagnostic messages.
-// #define IMUSE_DEBUG
-
 
 
 ////////////////////////////////////////
@@ -101,7 +97,6 @@
 	if (ptr == NULL) {
 		debug (1, "IMuseInternal::findStartOfSound(): Sound %d doesn't exist!", sound);
 		return NULL;
-
 	}
 
 	ptr += 8;

Index: imuse_internal.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_internal.h,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -d -r2.3 -r2.4
--- imuse_internal.h	23 May 2003 18:35:53 -0000	2.3
+++ imuse_internal.h	24 May 2003 19:20:52 -0000	2.4
@@ -26,6 +26,10 @@
 #include "common/scummsys.h"
 #include "scumm/instrument.h"
 
+// Unremark this statement to activate some of
+// the most common iMuse diagnostic messages.
+// #define IMUSE_DEBUG
+
 struct HookDatas;
 struct ParameterFader;
 struct DeferredCommand;
@@ -215,7 +219,6 @@
 	void clear_active_notes();
 
 	// Sequencer part
-	void uninit_seq();
 	void setTempo(uint32 data);
 	int start_seq_sound(int sound);
 	int query_param(int param);

Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -d -r2.4 -r2.5
--- imuse_player.cpp	24 May 2003 16:00:18 -0000	2.4
+++ imuse_player.cpp	24 May 2003 19:20:52 -0000	2.5
@@ -70,7 +70,6 @@
 _tempo (0),
 _tempo_eff (0),
 _speed (128),
-_abort (false),
 _isMT32 (false),
 _isGM (false),
 _se (0),
@@ -145,7 +144,6 @@
 }
 
 void Player::clear() {
-	uninit_seq();
 	cancel_volume_fade();
 	uninit_parts();
 	_se->ImFireAllTriggers (_id);
@@ -225,10 +223,6 @@
 	// In case another player is waiting to allocate parts
 	if (_midi)
 		_se->reallocateMidiChannels (_midi);
-}
-
-void Player::uninit_seq() {
-	_abort = true;
 }
 
 void Player::setSpeed(byte speed) {