thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Various iMuse cleanup

Browse source 
svn-id: r7900
This commit is contained in:
Jamieson Christian 2003-05-24 19:20:52 +00:00
parent f8e9e55fba
commit 30affb5fbc
3 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scumm/imuse.cpp
View file

@ -28,10 +28,6 @@
#include "common/util.h" #include "common/util.h"
#include "imuse_internal.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) { if (ptr == NULL) {
debug (1, "IMuseInternal::findStartOfSound(): Sound %d doesn't exist!", sound); debug (1, "IMuseInternal::findStartOfSound(): Sound %d doesn't exist!", sound);
return NULL; return NULL;
} }
ptr += 8; ptr += 8;

5
scumm/imuse_internal.h
View file

@ -26,6 +26,10 @@
#include "common/scummsys.h" #include "common/scummsys.h"
#include "scumm/instrument.h" #include "scumm/instrument.h"
// Unremark this statement to activate some of
// the most common iMuse diagnostic messages.
// #define IMUSE_DEBUG
struct HookDatas; struct HookDatas;
struct ParameterFader; struct ParameterFader;
struct DeferredCommand; struct DeferredCommand;
@ -215,7 +219,6 @@ protected:
void clear_active_notes(); void clear_active_notes();
// Sequencer part // Sequencer part
void uninit_seq();
void setTempo(uint32 data); void setTempo(uint32 data);
int start_seq_sound(int sound); int start_seq_sound(int sound);
int query_param(int param); int query_param(int param);

6
scumm/imuse_player.cpp
View file

@ -70,7 +70,6 @@ _loop_from_tick (0),
_tempo (0), _tempo (0),
_tempo_eff (0), _tempo_eff (0),
_speed (128), _speed (128),
_abort (false),
_isMT32 (false), _isMT32 (false),
_isGM (false), _isGM (false),
_se (0), _se (0),
@ -145,7 +144,6 @@ bool Player::isFadingOut() {
} }
void Player::clear() { void Player::clear() {
uninit_seq();
cancel_volume_fade(); cancel_volume_fade();
uninit_parts(); uninit_parts();
_se->ImFireAllTriggers (_id); _se->ImFireAllTriggers (_id);
@ -227,10 +225,6 @@ void Player::uninit_parts() {
_se->reallocateMidiChannels (_midi); _se->reallocateMidiChannels (_midi);
} }
void Player::uninit_seq() {
_abort = true;
}
void Player::setSpeed(byte speed) { void Player::setSpeed(byte speed) {
_speed = speed; _speed = speed;
if (_parser) if (_parser)