Various iMuse cleanup

svn-id: r7900

3 files changed, 4 insertions, 12 deletions

diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index d5ec87f37d..2d3f2a4ac0 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -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 @@ byte *IMuseInternal::findStartOfSound (int sound) {
 	if (ptr == NULL) {
 		debug (1, "IMuseInternal::findStartOfSound(): Sound %d doesn't exist!", sound);
 		return NULL;
-
 	}
 
 	ptr += 8;
diff --git a/scumm/imuse_internal.h b/scumm/imuse_internal.h
index fc6ce08d6e..23642679b8 100644
--- a/scumm/imuse_internal.h
+++ b/scumm/imuse_internal.h
@@ -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 @@ protected:
 	void clear_active_notes();
 
 	// Sequencer part
-	void uninit_seq();
 	void setTempo(uint32 data);
 	int start_seq_sound(int sound);
 	int query_param(int param);
diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp
index d88a6e5d2f..9f35b86909 100644
--- a/scumm/imuse_player.cpp
+++ b/scumm/imuse_player.cpp
@@ -70,7 +70,6 @@ _loop_from_tick (0),
 _tempo (0),
 _tempo_eff (0),
 _speed (128),
-_abort (false),
 _isMT32 (false),
 _isGM (false),
 _se (0),
@@ -145,7 +144,6 @@ bool Player::isFadingOut() {
 }
 
 void Player::clear() {
-	uninit_seq();
 	cancel_volume_fade();
 	uninit_parts();
 	_se->ImFireAllTriggers (_id);
@@ -227,10 +225,6 @@ void Player::uninit_parts() {
 		_se->reallocateMidiChannels (_midi);
 }
 
-void Player::uninit_seq() {
-	_abort = true;
-}
-
 void Player::setSpeed(byte speed) {
 	_speed = speed;
 	if (_parser)