diff options
| author | Jamieson Christian | 2003-05-24 19:43:20 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-05-24 19:43:20 +0000 |
| commit | 34162afd9e27d6d8d9bbf9b1131fa987283b7bba (patch) | |
| tree | 3eb9e3f2871f08cde7d622bf0da9cc3a33e0d1d5 | |
| parent | 30affb5fbc846925952be07ce12617b4e825d36d (diff) | |
| download | scummvm-rg350-34162afd9e27d6d8d9bbf9b1131fa987283b7bba.tar.gz scummvm-rg350-34162afd9e27d6d8d9bbf9b1131fa987283b7bba.tar.bz2 scummvm-rg350-34162afd9e27d6d8d9bbf9b1131fa987283b7bba.zip | |
Removed more unnecessary code
svn-id: r7901
| -rw-r--r-- | scumm/imuse_internal.h | 3 | ||||
| -rw-r--r-- | scumm/imuse_player.cpp | 11 |
2 files changed, 1 insertions, 13 deletions
diff --git a/scumm/imuse_internal.h b/scumm/imuse_internal.h index 23642679b8..76d132589e 100644 --- a/scumm/imuse_internal.h +++ b/scumm/imuse_internal.h @@ -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 @@ protected: int query_part_param(int param, byte chan); void turn_off_parts(); void play_active_notes(); - void cancel_volume_fade(); void transitionParameters(); diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp index 9f35b86909..a4e5bb63c1 100644 --- a/scumm/imuse_player.cpp +++ b/scumm/imuse_player.cpp @@ -144,7 +144,6 @@ bool Player::isFadingOut() { } void Player::clear() { - cancel_volume_fade(); uninit_parts(); _se->ImFireAllTriggers (_id); _active = false; @@ -204,16 +203,6 @@ void Player::setTempo(uint32 b) { _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() { if (_parts && _parts->_player != this) error("asd"); |