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

Revamped iMuse and Player classes. Player now uses MidiParser to parse its data, which will allow it to parse other MIDI formats. To receive parsed data, Player now derives from MidiDriver to act as a "fake MIDI driver".

Browse source 
Miscellaneous upgrades and fixes to MidiParser, including the Smart Jump (which could not be tested before iMuse started making use of the MidiParser).

*** THIS IS A BIG UPGRADE! EXTENSIVE REGRESSION TESTING IS NEEDED! ***

This has been tested through the intros and a number of other scenes from MI2, FOA and S&M.

NOTE! This upgrade introduces savegame format version V19. Earlier version savegames will load, but the music will simply start over from the beginning. Only V19 and later games will properly restore the position of the music! Don't say you weren't warned....

svn-id: r7849
This commit is contained in:
Jamieson Christian 2003-05-23 04:19:47 +00:00
parent 006d0a5ff8
commit c6568530bd
12 changed files with 741 additions and 923 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backends/midi/adlib.cpp
View file

@ -564,9 +564,9 @@ public:
void setTimerCallback (void *timer_param, void (*timer_proc) (void *));
uint32 getBaseTempo() {
#ifdef _WIN32_WCE
return 0x1D9000 * 2; // Sampled down to 11 kHz
return 3991 * 2; // Sampled down to 11 kHz
#else //_WIN32_WCE
return 0x1D9000;
return 3991; // 88 samples per call (at 22 kHz mono)
#endif //_WIN32_WCE
}

366
scumm/imuse.cpp
View file

@ -40,6 +40,32 @@
//
////////////////////////////////////////
IMuseInternal::IMuseInternal() :
_old_adlib_instruments (false),
_enable_multi_midi (false),
_midi_adlib (0),
_midi_native (0),
_base_sounds (0),
_paused (false),
_initialized (false),
_tempoFactor (0),
_queue_end (0),
_queue_pos (0),
_queue_sound (0),
_queue_adding (0),
_queue_marker (0),
_queue_cleared (0),
_master_volume (0),
_music_volume (0),
_trigger_count (0),
_snm_trigger_index (0)
{
memset (_channel_volume,0,sizeof(_channel_volume));
memset (_channel_volume_eff,0,sizeof(_channel_volume_eff));
memset (_volchan_table,0,sizeof(_volchan_table));
memset (_active_notes,0,sizeof(_active_notes));
}
IMuseInternal::~IMuseInternal() {
terminate();
}
@ -215,12 +241,8 @@ bool IMuseInternal::startSound(int sound) {
// race conditions that were observed in MI2. Reference
// Bug #590511 and Patch #607175 (which was reversed to fix
// an FOA regression: Bug #622606).
for (i = ARRAYSIZE(_players), player = _players; i != 0; i--, player++) {
if (player->_active && player->_id == sound)
break;
}
if (!i)
player = findActivePlayer (sound);
if (!player)
player = allocate_player(128);
if (!player)
return false;
@ -236,11 +258,11 @@ Player *IMuseInternal::allocate_player(byte priority) {
byte bestpri = 255;
for (i = ARRAYSIZE(_players); i != 0; i--, player++) {
if (!player->_active)
if (!player->isActive())
return player;
if (player->_priority < bestpri) {
if (player->getPriority() < bestpri) {
best = player;
bestpri = player->_priority;
bestpri = player->getPriority();
}
}
@ -256,25 +278,11 @@ void IMuseInternal::init_players() {
int i;
for (i = ARRAYSIZE(_players); i != 0; i--, player++) {
player->_active = false;
player->clear(); // Used to just set _active to false
player->_se = this;
}
}
void IMuseInternal::init_sustaining_notes() {
SustainingNotes *next = NULL, *sn = _sustaining_notes;
int i;
_sustain_notes_used = NULL;
_sustain_notes_head = NULL;
for (i = ARRAYSIZE(_sustaining_notes); i != 0; i--, sn++) {
sn->next = next;
next = sn;
}
_sustain_notes_free = next;
}
void IMuseInternal::init_parts() {
Part *part;
int i;
@ -286,15 +294,11 @@ void IMuseInternal::init_parts() {
}
int IMuseInternal::stopSound(int sound) {
Player *player = _players;
int i;
int r = -1;
for (i = ARRAYSIZE(_players); i != 0; i--, player++) {
if (player->_active && player->_id == sound) {
player->clear();
r = 0;
}
Player *player = findActivePlayer (sound);
if (player) {
player->clear();
r = 0;
}
return r;
}
@ -304,7 +308,7 @@ int IMuseInternal::stop_all_sounds() {
int i;
for (i = ARRAYSIZE(_players); i != 0; i--, player++) {
if (player->_active)
if (player->isActive())
player->clear();
}
return 0;
@ -317,7 +321,6 @@ void IMuseInternal::on_timer (MidiDriver *midi) {
if (midi == _midi_native || !_midi_native)
handleDeferredCommands (midi);
sequencer_timers (midi);
expire_sustain_notes (midi);
}
void IMuseInternal::sequencer_timers (MidiDriver *midi) {
@ -325,8 +328,8 @@ void IMuseInternal::sequencer_timers (MidiDriver *midi) {
int i;
for (i = ARRAYSIZE(_players); i != 0; i--, player++) {
if (player->_active && player->_midi == midi) {
player->sequencer_timer();
if (player->isActive() && player->getMidiDriver() == midi) {
player->onTimer();
}
}
}
@ -407,52 +410,10 @@ Part *IMuseInternal::allocate_part (byte pri, MidiDriver *midi) {
return best;
}
void IMuseInternal::expire_sustain_notes (MidiDriver *midi) {
SustainingNotes *sn, *next;
Player *player;
uint32 counter;
for (sn = _sustain_notes_head; sn; sn = next) {
next = sn->next;
player = sn->player;
if (player->_midi != midi) continue;
counter = sn->counter + player->_timer_speed;
sn->pos += counter >> 16;
sn->counter = (unsigned short)counter & 0xFFFF;
if (sn->pos >= sn->off_pos) {
player->key_off(sn->chan, sn->note);
// Unlink the node
if (next)
next->prev = sn->prev;
if (sn->prev)
sn->prev->next = next;
else
_sustain_notes_head = next;
// And put it in the free list
sn->next = _sustain_notes_free;
_sustain_notes_free = sn;
}
}
}
int IMuseInternal::getSoundStatus(int sound) {
int i;
Player *player;
for (i = ARRAYSIZE(_players), player = _players; i != 0; i--, player++) {
if (player->_active && player->_id == (uint16)sound) {
// Assume that anyone asking for the sound status is
// really asking "is it ok if I start playing this
// sound now?" So if the sound is about to fade out,
// pretend it's not playing.
if (player->is_fading_out())
continue;
return 1;
}
}
Player *player = findActivePlayer (sound);
if (player && !player->isFadingOut())
return 1;
return get_queue_sound_status(sound);
}
@ -461,12 +422,9 @@ int IMuseInternal::getSoundStatus(int sound) {
// other sounds. This is the method to use when determining
// what resources to expire from memory.
bool IMuseInternal::get_sound_active(int sound) {
int i;
Player *player;
for (i = ARRAYSIZE(_players), player = _players; i != 0; i--, player++) {
if (player->_active && player->_id == (uint16)sound)
return 1;
}
Player *player = findActivePlayer (sound);
if (player)
return 1;
return (get_queue_sound_status(sound) != 0);
}
@ -497,12 +455,11 @@ int IMuseInternal::set_volchan(int sound, int volchan) {
return -1;
if (r >= 8) {
for (i = ARRAYSIZE(_players), player = _players; i != 0; i--, player++) {
if (player->_active && player->_id == (uint16)sound && player->_vol_chan != (uint16)volchan) {
player->_vol_chan = volchan;
player->set_vol(player->_volume);
return 0;
}
player = findActivePlayer (sound);
if (player && player->_vol_chan != (uint16)volchan) {
player->_vol_chan = volchan;
player->setVolume (player->getVolume());
return 0;
}
return -1;
} else {
@ -510,12 +467,12 @@ int IMuseInternal::set_volchan(int sound, int volchan) {
num = 0;
sameid = NULL;
for (i = ARRAYSIZE(_players), player = _players; i != 0; i--, player++) {
if (player->_active) {
if (player->isActive()) {
if (player->_vol_chan == (uint16)volchan) {
num++;
if (!best || player->_priority <= best->_priority)
if (!best || player->getPriority() <= best->getPriority())
best = player;
} else if (player->_id == (uint16)sound) {
} else if (player->getID() == (uint16)sound) {
sameid = player;
}
}
@ -525,7 +482,7 @@ int IMuseInternal::set_volchan(int sound, int volchan) {
if (num >= r)
best->clear();
player->_vol_chan = volchan;
player->set_vol(player->_volume);
player->setVolume (player->getVolume());
return 0;
}
}
@ -702,17 +659,14 @@ int32 IMuseInternal::doCommand(int a, int b, int c, int d, int e, int f, int g,
return stop_all_sounds();
case 12:
// Sam & Max: Player-scope commands
for (i = ARRAYSIZE(_players), player = _players; i != 0; i--, player++) {
if (player->_active && player->_id == (uint16)b)
break;
}
if (!i)
player = findActivePlayer (b);
if (!player)
return -1;
switch (d) {
case 6:
// Set player volume.
return player->set_vol (e);
return player->setVolume (e);
default:
warning("IMuseInternal::doCommand (6) unsupported sub-command %d", d);
}
@ -720,19 +674,18 @@ int32 IMuseInternal::doCommand(int a, int b, int c, int d, int e, int f, int g,
case 13:
return getSoundStatus(b);
case 14:
// Sam and Max: Parameter transition
player = this->get_player_byid (b);
// Sam and Max: Parameter fade
player = this->findActivePlayer (b);
if (player)
return player->addParameterFader (d, e, f);
return -1;
case 15:
// Sam & Max: Set hook for a "maybe" jump
for (i = ARRAYSIZE(_players), player = _players; i != 0; i--, player++) {
if (player->_active && player->_id == (uint16)b) {
player->_hook.set (0, d, 0);
return 0;
}
player = findActivePlayer (b);
if (player) {
player->setHook (0, d, 0);
return 0;
}
return -1;
case 16:
@ -783,12 +736,12 @@ int32 IMuseInternal::doCommand(int a, int b, int c, int d, int e, int f, int g,
}
} else if (param == 1) {
if ((1 << cmd) & (0x783FFF)) {
player = get_player_byid(b);
player = findActivePlayer(b);
if (!player)
return -1;
if ((1 << cmd) & (1 << 11 | 1 << 22)) {
assert(c >= 0 && c <= 15);
player = (Player *)player->get_part(c);
player = (Player *) player->getPart(c);
if (!player)
return -1;
}
@ -798,46 +751,46 @@ int32 IMuseInternal::doCommand(int a, int b, int c, int d, int e, int f, int g,
case 0:
if (g_scumm->_gameId == GID_SAMNMAX) {
if (d == 1) // Measure number
return ((player->_beat_index - 1) >> 2) + 1;
return ((player->getBeatIndex() - 1) >> 2) + 1;
else if (d == 2) // Beat number
return player->_beat_index;
return player->getBeatIndex();
return -1;
} else {
return player->get_param(c, d);
return player->getParam(c, d);
}
case 1:
if (g_scumm->_gameId == GID_SAMNMAX)
player->jump (d - 1, (e - 1) * 4 + f, ((g * player->_ticks_per_beat) >> 2) + h);
player->jump (d - 1, (e - 1) * 4 + f, ((g * player->getTicksPerBeat()) >> 2) + h);
else
player->set_priority(c);
player->setPriority(c);
return 0;
case 2:
return player->set_vol(c);
return player->setVolume(c);
case 3:
player->set_pan(c);
player->setPan(c);
return 0;
case 4:
return player->set_transpose(c, d);
return player->setTranspose(c, d);
case 5:
player->set_detune(c);
player->setDetune(c);
return 0;
case 6:
player->set_speed(c);
player->setSpeed(c);
return 0;
case 7:
return player->jump(c, d, e) ? 0 : -1;
case 8:
return player->scan(c, d, e);
case 9:
return player->set_loop(c, d, e, f, g) ? 0 : -1;
return player->setLoop(c, d, e, f, g) ? 0 : -1;
case 10:
player->clear_loop();
player->clearLoop();
return 0;
case 11:
((Part *)player)->set_onoff(d != 0);
return 0;
case 12:
return player->_hook.set(c, d, e);
return player->setHook(c, d, e);
case 13:
return player->addParameterFader (ParameterFader::pfVolume, c, d);
case 14:
@ -847,13 +800,13 @@ int32 IMuseInternal::doCommand(int a, int b, int c, int d, int e, int f, int g,
case 16:
return clear_queue();
case 19:
return player->get_param(c, d);
return player->getParam(c, d);
case 20:
return player->_hook.set(c, d, e);
return player->setHook(c, d, e);
case 21:
return -1;
case 22:
((Part *)player)->set_vol(d);
((Part *)player)->setVolume(d);
return 0;
case 23:
return query_queue(b);
@ -969,8 +922,8 @@ void IMuseInternal::update_volumes() {
int i;
for (i = ARRAYSIZE(_players), player = _players; i != 0; i--, player++) {
if (player->_active)
player->set_vol(player->_volume);
if (player->isActive())
player->setVolume (player->getVolume());
}
}
@ -1041,18 +994,15 @@ int HookDatas::set(byte cls, byte value, byte chan) {
return 0;
}
Player *IMuseInternal::get_player_byid(int id) {
Player *IMuseInternal::findActivePlayer (int id) {
int i;
Player *player, *found = NULL;
Player *player;
for (i = ARRAYSIZE(_players), player = _players; i != 0; i--, player++) {
if (player->_active && player->_id == (uint16)id) {
if (found)
return NULL;
found = player;
}
if (player->isActive() && player->getID() == (uint16)id)
return player;
}
return found;
return NULL;
}
int IMuseInternal::get_volchan_entry(uint a) {
@ -1082,7 +1032,7 @@ uint32 IMuseInternal::property(int prop, uint32 value) {
_midi_adlib = NULL;
int i;
for (i = 0; i < ARRAYSIZE(_players); ++i) {
if (_players[i]._active && _players[i]._midi == driver)
if (_players[i].isActive() && _players[i].getMidiDriver() == driver)
_players[i].clear();
}
driver->close();
@ -1122,7 +1072,6 @@ int IMuseInternal::initialize(OSystem *syst, MidiDriver *native_midi) {
_channel_volume[i] = _channel_volume_eff[i] = _volchan_table[i] = 127;
init_players();
init_sustaining_notes();
init_queue();
init_parts();
@ -1161,7 +1110,7 @@ void IMuseInternal::pause(bool paused) {
}
void IMuseInternal::handleDeferredCommands (MidiDriver *midi) {
uint32 advance = midi->getBaseTempo() / 500;
uint32 advance = midi->getBaseTempo();
DeferredCommand *ptr = &_deferredCommands[0];
int i;
@ -1176,8 +1125,8 @@ void IMuseInternal::handleDeferredCommands (MidiDriver *midi) {
}
}
// "time" is referenced as hundredths of a second.
// IS THAT CORRECT??
// "time" is interpreted as hundredths of a second.
// FIXME: Is that correct?
// We convert it to microseconds before prceeding
void IMuseInternal::addDeferredCommand (int time, int a, int b, int c, int d, int e, int f) {
DeferredCommand *ptr = &_deferredCommands[0];
@ -1250,42 +1199,6 @@ int IMuseInternal::save_or_load(Serializer *ser, Scumm *scumm) {
MKEND()
};
const SaveLoadEntry playerEntries[] = {
MKREF(Player, _parts, TYPE_PART, VER_V8),
MKLINE(Player, _active, sleByte, VER_V8),
MKLINE(Player, _id, sleUint16, VER_V8),
MKLINE(Player, _priority, sleByte, VER_V8),
MKLINE(Player, _volume, sleByte, VER_V8),
MKLINE(Player, _pan, sleInt8, VER_V8),
MKLINE(Player, _transpose, sleByte, VER_V8),
MKLINE(Player, _detune, sleInt8, VER_V8),
MKLINE(Player, _vol_chan, sleUint16, VER_V8),
MKLINE(Player, _vol_eff, sleByte, VER_V8),
MKLINE(Player, _speed, sleByte, VER_V8),
MKLINE(Player, _song_index, sleUint16, VER_V8),
MKLINE(Player, _track_index, sleUint16, VER_V8),
MKLINE(Player, _timer_counter, sleUint16, VER_V8),
MKLINE(Player, _loop_to_beat, sleUint16, VER_V8),
MKLINE(Player, _loop_from_beat, sleUint16, VER_V8),
MKLINE(Player, _loop_counter, sleUint16, VER_V8),
MKLINE(Player, _loop_to_tick, sleUint16, VER_V8),
MKLINE(Player, _loop_from_tick, sleUint16, VER_V8),
MKLINE(Player, _tempo, sleUint32, VER_V8),
MKLINE(Player, _cur_pos, sleUint32, VER_V8),
MKLINE(Player, _next_pos, sleUint32, VER_V8),
MKLINE(Player, _song_offset, sleUint32, VER_V8),
MKLINE(Player, _tick_index, sleUint16, VER_V8),
MKLINE(Player, _beat_index, sleUint16, VER_V8),
MKLINE(Player, _ticks_per_beat, sleUint16, VER_V8),
MKLINE(Player, _hook._jump[0], sleByte, VER_V8),
MKLINE(Player, _hook._transpose, sleByte, VER_V8),
MKARRAY(Player, _hook._part_onoff[0], sleByte, 16, VER_V8),
MKARRAY(Player, _hook._part_volume[0], sleByte, 16, VER_V8),
MKARRAY(Player, _hook._part_program[0], sleByte, 16, VER_V8),
MKARRAY(Player, _hook._part_transpose[0], sleByte, 16, VER_V8),
MKEND()
};
// VolumeFader is obsolete.
const SaveLoadEntry volumeFaderEntries[] = {
MK_OBSOLETE_REF(VolumeFader, player, TYPE_PLAYER, VER_V8, VER_V16),
@ -1300,15 +1213,6 @@ int IMuseInternal::save_or_load(Serializer *ser, Scumm *scumm) {
MKEND()
};
const SaveLoadEntry parameterFaderEntries[] = {
MKLINE(ParameterFader, param, sleInt16, VER_V17),
MKLINE(ParameterFader, start, sleInt16, VER_V17),
MKLINE(ParameterFader, end, sleInt16, VER_V17),
MKLINE(ParameterFader, total_time, sleUint32, VER_V17),
MKLINE(ParameterFader, current_time, sleUint32, VER_V17),
MKEND()
};
const SaveLoadEntry partEntries[] = {
MKREF(Part, _next, TYPE_PART, VER_V8),
MKREF(Part, _prev, TYPE_PART, VER_V8),
@ -1348,11 +1252,8 @@ int IMuseInternal::save_or_load(Serializer *ser, Scumm *scumm) {
ser->_load_ref = loadReference;
ser->saveLoadEntries(this, mainEntries);
for (i = 0; i < ARRAYSIZE(_players); ++i) {
ser->saveLoadEntries (&_players[i], playerEntries);
ser->saveLoadArrayOf (_players[i]._parameterFaders, ARRAYSIZE(_players[i]._parameterFaders),
sizeof(ParameterFader), parameterFaderEntries);
}
for (i = 0; i < ARRAYSIZE(_players); ++i)
_players[i].save_or_load (ser);
ser->saveLoadArrayOf(_parts, ARRAYSIZE(_parts), sizeof(_parts[0]), partEntries);
{ // Load/save the instrument definitions, which were revamped with V11.
@ -1374,7 +1275,6 @@ int IMuseInternal::save_or_load(Serializer *ser, Scumm *scumm) {
if (!ser->isSaving()) {
// Load all sounds that we need
fix_players_after_load(scumm);
init_sustaining_notes();
fix_parts_after_load();
set_master_volume (_master_volume);
@ -1407,22 +1307,15 @@ void IMuseInternal::fix_players_after_load(Scumm *scumm) {
int i;
for (i = ARRAYSIZE(_players); i != 0; i--, player++) {
if (player->_active) {
scumm->getResourceAddress(rtSound, player->_id);
player->_midi = getBestMidiDriver (player->_id);
if (player->_midi == NULL) {
player->clear();
} else {
player->set_tempo(player->_tempo);
player->_mt32emulate = isMT32(player->_id);
player->_isGM = isGM(player->_id);
}
if (player->isActive()) {
scumm->getResourceAddress(rtSound, player->getID());
player->fixAfterLoad();
}
}
}
void Part::set_detune(int8 detune) {
_detune_eff = clamp((_detune = detune) + _player->_detune, -128, 127);
_detune_eff = clamp((_detune = detune) + _player->getDetune(), -128, 127);
if (_mc) {
_mc->pitchBend (clamp(_pitchbend +
(_detune_eff * 64 / 12) +
@ -1439,26 +1332,26 @@ void Part::set_pitchbend(int value) {
}
}
void Part::set_vol(uint8 vol) {
_vol_eff = ((_vol = vol) + 1) * _player->_vol_eff >> 7;
void Part::setVolume(uint8 vol) {
_vol_eff = ((_vol = vol) + 1) * _player->getEffectiveVolume() >> 7;
if (_mc)
_mc->volume (_vol_eff);
}
void Part::set_pri(int8 pri) {
_pri_eff = clamp((_pri = pri) + _player->_priority, 0, 255);
_pri_eff = clamp((_pri = pri) + _player->getPriority(), 0, 255);
if (_mc)
_mc->priority (_pri_eff);
}
void Part::set_pan(int8 pan) {
_pan_eff = clamp((_pan = pan) + _player->_pan, -64, 63);
_pan_eff = clamp((_pan = pan) + _player->getPan(), -64, 63);
if (_mc)
_mc->panPosition (_pan_eff + 0x40);
}
void Part::set_transpose(int8 transpose) {
_transpose_eff = transpose_clamp((_transpose = transpose) + _player->_transpose, -12, 12);
_transpose_eff = transpose_clamp((_transpose = transpose) + _player->getTranspose(), -12, 12);
if (_mc) {
_mc->pitchBend (clamp(_pitchbend +
(_detune_eff * 64 / 12) +
@ -1493,7 +1386,7 @@ void Part::set_effect_level(uint level)
void Part::fix_after_load() {
set_transpose(_transpose);
set_vol(_vol);
setVolume(_vol);
set_detune(_detune);
set_pri(_pri);
set_pan(_pan);
@ -1515,7 +1408,7 @@ void Part::set_onoff(bool on) {
if (!on)
off();
if (!_percussion)
_player->_se->reallocateMidiChannels (_player->_midi);
_player->_se->reallocateMidiChannels (_player->getMidiDriver());
}
}
@ -1547,7 +1440,7 @@ void Part::key_on(byte note, byte velocity) {
if (mc && _instrument.isValid()) {
mc->noteOn (note, velocity);
} else if (_percussion) {
mc = _player->_midi->getPercussionChannel();
mc = _player->getMidiDriver()->getPercussionChannel();
if (!mc)
return;
mc->volume (_vol_eff);
@ -1562,7 +1455,7 @@ void Part::key_off(byte note) {
if (mc) {
mc->noteOff (note);
} else if (_percussion) {
mc = _player->_midi->getPercussionChannel();
mc = _player->getMidiDriver()->getPercussionChannel();
if (mc)
mc->noteOff (note);
}
@ -1579,24 +1472,17 @@ void Part::init() {
void Part::setup(Player *player) {
_player = player;
// Insert first into player's list
_prev = NULL;
_next = player->_parts;
if (player->_parts)
player->_parts->_prev = this;
player->_parts = this;
_percussion = (player->_isGM && _chan == 9); // true;
_percussion = (player->isGM() && _chan == 9); // true;
_on = true;
_pri_eff = player->_priority;
_pri_eff = player->getPriority();
_pri = 0;
_vol = 127;
_vol_eff = player->_vol_eff;
_pan = clamp(player->_pan, -64, 63);
_transpose_eff = player->_transpose;
_vol_eff = player->getEffectiveVolume();
_pan = clamp (player->getPan(), -64, 63);
_transpose_eff = player->getTranspose();
_transpose = 0;
_detune = 0;
_detune_eff = player->_detune;
_detune_eff = player->getDetune();
_pitchbend_factor = 2;
_pitchbend = 0;
_effect_level = 64;
@ -1613,17 +1499,8 @@ void Part::uninit() {
if (!_player)
return;
off();
// Unlink
if (_next)
_next->_prev = _prev;
if (_prev)
_prev->_next = _next;
else
_player->_parts = _next;
_player->removePart (this);
_player = NULL;
_next = NULL;
_prev = NULL;
}
void Part::off() {
@ -1637,7 +1514,7 @@ void Part::off() {
bool Part::clearToTransmit() {
if (_mc) return true;
if (_instrument.isValid()) _player->_se->reallocateMidiChannels (_player->_midi);
if (_instrument.isValid()) _player->_se->reallocateMidiChannels (_player->getMidiDriver());
return false;
}
@ -1684,18 +1561,25 @@ int Part::update_actives(uint16 *active) {
void Part::set_program(byte program) {
_bank = 0;
_instrument.program (program, _player->_mt32emulate);
_instrument.program (program, _player->isMT32());
if (clearToTransmit())
_instrument.send (_mc);
}
void Part::set_instrument(uint b) {
_bank = (byte)(b >> 8);
_instrument.program ((byte) b, _player->_mt32emulate);
_instrument.program ((byte) b, _player->isMT32());
if (clearToTransmit())
_instrument.send (_mc);
}
void Part::silence() {
if (!_mc)
return;
_mc->allNotesOff();
memset (_actives, 0, sizeof (_actives));
}
////////////////////////////////////////
//
// Some more IMuseInternal stuff
@ -1718,7 +1602,7 @@ void IMuseInternal::reallocateMidiChannels (MidiDriver *midi) {
hipri = 0;
hipart = NULL;
for (i = 32, part = _parts; i; i--, part++) {
if (part->_player && part->_player->_midi == midi &&
if (part->_player && part->_player->getMidiDriver() == midi &&
!part->_percussion && part->_on &&
!part->_mc && part->_pri_eff >= hipri)
{

156
scumm/imuse_internal.h
View file

@ -22,8 +22,9 @@
#ifndef DEFINED_IMUSE_INTERNAL
#define DEFINED_IMUSE_INTERNAL
#include "sound/mididrv.h"
#include "common/scummsys.h"
#include "instrument.h"
#include "scumm/instrument.h"
struct HookDatas;
struct ParameterFader;
@ -32,13 +33,12 @@ struct ImTrigger;
struct SustainingNotes;
struct CommandQueue;
struct IsNoteCmdData;
struct Player;
class Player;
struct Part;
class IMuseInternal;
class IMuseInternal;
// Some entities also referenced
class MidiDriver;
class MidiChannel;
class MidiParser;
class Scumm;
class OSystem;
@ -70,7 +70,7 @@ class OSystem;
//
////////////////////////////////////////
static int clamp(int val, int min, int max) {
inline int clamp(int val, int min, int max) {
if (val < min)
return min;
if (val > max)
@ -78,7 +78,7 @@ static int clamp(int val, int min, int max) {
return val;
}
static int transpose_clamp(int a, int b, int c) {
inline int transpose_clamp(int a, int b, int c) {
if (b > a)
a += (b - a + 11) / 12 * 12;
if (c < a)
@ -104,6 +104,7 @@ struct HookDatas {
int query_param(int param, byte chan);
int set(byte cls, byte value, byte chan);
HookDatas() { memset (this, 0, sizeof (HookDatas)); }
};
struct ParameterFader {
@ -127,6 +128,7 @@ struct DeferredCommand {
MidiDriver *midi;
uint32 time_left;
int a, b, c, d, e, f;
DeferredCommand() { memset (this, 0, sizeof (DeferredCommand)); }
};
struct ImTrigger {
@ -134,31 +136,18 @@ struct ImTrigger {
byte id;
uint16 expire;
byte command [4];
};
struct SustainingNotes {
SustainingNotes *next;
SustainingNotes *prev;
Player *player;
byte note, chan;
uint32 off_pos;
uint32 pos;
uint16 counter;
ImTrigger() { memset (this, 0, sizeof (ImTrigger)); }
};
struct CommandQueue {
uint16 array[8];
CommandQueue() { memset (this, 0, sizeof (CommandQueue)); }
};
struct IsNoteCmdData {
byte chan;
byte note;
byte vel;
};
struct Player {
IMuseInternal *_se;
class Player : public MidiDriver {
protected:
MidiDriver *_midi;
MidiParser *_parser;
Part *_parts;
bool _active;
@ -169,12 +158,10 @@ struct Player {
int8 _pan;
int8 _transpose;
int8 _detune;
uint _vol_chan;
byte _vol_eff;
uint _song_index;
uint _track_index;
uint _timer_counter;
uint _loop_to_beat;
uint _loop_from_beat;
uint _loop_counter;
@ -182,26 +169,24 @@ struct Player {
uint _loop_from_tick;
uint32 _tempo;
uint32 _tempo_eff; // No Save
uint32 _cur_pos;
uint32 _next_pos;
uint32 _song_offset;
uint32 _timer_speed; // No Save
uint _tick_index;
uint _beat_index;
uint _ticks_per_beat;
byte _speed; // No Save
byte _speed;
bool _abort;
// This does not get used by us! It is only
// here for save/load purposes, and gets
// passed on to the MidiParser during
// fixAfterLoad().
uint32 _music_tick;
HookDatas _hook;
ParameterFader _parameterFaders[4];
bool _mt32emulate;
bool _isMT32;
bool _isGM;
protected:
// Player part
void hook_clear();
void clear();
bool startSound (int sound, MidiDriver *midi);
void uninit_parts();
byte *parse_midi(byte *s);
void key_off(uint8 chan, byte data);
@ -215,20 +200,12 @@ struct Player {
void maybe_set_program(byte *data);
void maybe_set_transpose_part(byte *data);
uint update_actives();
Part *get_part(uint8 part);
void turn_off_pedals();
int set_vol(byte vol);
int get_param(int param, byte chan);
int query_part_param(int param, byte chan);
int set_transpose(byte relative, int b);
void set_priority(int pri);
void set_pan(int pan);
void set_detune(int detune);
int query_part_param(int param, byte chan);
void turn_off_parts();
void play_active_notes();
void cancel_volume_fade();
int addParameterFader (int param, int target, int time);
void transitionParameters();
static void decode_sysex_bytes(byte *src, byte *dst, int len);
@ -238,24 +215,68 @@ struct Player {
void clear_active_notes();
// Sequencer part
bool set_loop(uint count, uint tobeat, uint totick, uint frombeat, uint fromtick);
void clear_loop();
void set_speed(byte speed);
bool jump(uint track, uint beat, uint tick);
void uninit_seq();
void set_tempo(uint32 data);
void setTempo(uint32 data);
int start_seq_sound(int sound);
void find_sustaining_notes(byte *a, byte *b, uint32 l);
int scan(uint totrack, uint tobeat, uint totick);
int query_param(int param);
bool is_fading_out();
void sequencer_timer();
public:
IMuseInternal *_se;
uint _vol_chan;
Player() {
memset(this,0,sizeof(Player));
}
public:
Player();
virtual ~Player();
int addParameterFader (int param, int target, int time);
void clear();
void clearLoop();
void fixAfterLoad();
Part * getActivePart (uint8 part);
uint getBeatIndex();
int8 getDetune() { return _detune; }
byte getEffectiveVolume() { return _vol_eff; }
int getID() { return _id; }
MidiDriver *getMidiDriver() { return _midi; }
int getParam (int param, byte chan);
int8 getPan() { return _pan; }
Part * getPart (uint8 part);
byte getPriority() { return _priority; }
uint32 getTempo() { return _tempo; }
uint getTicksPerBeat() { return TICKS_PER_BEAT; }
int8 getTranspose() { return _transpose; }
byte getVolume() { return _volume; }
bool isActive() { return _active; }
bool isFadingOut();
bool isGM() { return _isGM; }
bool isMT32() { return _isMT32; }
bool jump (uint track, uint beat, uint tick);
void onTimer();
void removePart (Part *part);
int scan (uint totrack, uint tobeat, uint totick);
int save_or_load (Serializer *ser);
int setHook (byte cls, byte value, byte chan) { return _hook.set (cls, value, chan); }
void setDetune (int detune);
bool setLoop (uint count, uint tobeat, uint totick, uint frombeat, uint fromtick);
void setPan (int pan);
void setPriority (int pri);
void setSpeed (byte speed);
int setTranspose(byte relative, int b);
int setVolume (byte vol);
bool startSound (int sound, MidiDriver *midi);
public:
// MidiDriver interface
int open() { return 0; }
void close() { }
void send (uint32 b);
const char *getErrorName (int error_code) { return "Unknown"; }
void sysEx (byte *msg, uint16 length);
void metaEvent (byte type, byte *data, uint16 length);
void setTimerCallback (void *timer_param, void (*timer_proc) (void *)) { }
uint32 getBaseTempo();
MidiChannel *allocateChannel() { return 0; }
MidiChannel *getPercussionChannel() { return 0; }
};
struct Part {
@ -300,7 +321,7 @@ struct Part {
void load_global_instrument (byte b);
void set_transpose(int8 transpose);
void set_vol(uint8 volume);
void setVolume(uint8 volume);
void set_detune(int8 detune);
void set_pri(int8 pri);
void set_pan(int8 pan);
@ -329,7 +350,7 @@ struct Part {
// imuse.h contains a public version of the same class.
// the public version, only contains a set of methods.
class IMuseInternal {
friend struct Player;
friend class Player;
private:
bool _old_adlib_instruments;
@ -348,10 +369,6 @@ private:
uint _queue_end, _queue_pos, _queue_sound;
byte _queue_adding;
SustainingNotes *_sustain_notes_used;
SustainingNotes *_sustain_notes_free;
SustainingNotes *_sustain_notes_head;
byte _queue_marker;
byte _queue_cleared;
byte _master_volume; // Master volume. 0-255
@ -366,7 +383,6 @@ private:
uint16 _volchan_table[8];
Player _players[8];
SustainingNotes _sustaining_notes[24];
Part _parts[32];
uint16 _active_notes[128];
@ -383,11 +399,9 @@ private:
void initMidiDriver (MidiDriver *midi);
void init_players();
void init_parts();
void init_sustaining_notes();
void init_queue();
void sequencer_timers (MidiDriver *midi);
void expire_sustain_notes (MidiDriver *midi);
MidiDriver *getBestMidiDriver (int sound);
Player *allocate_player(byte priority);
@ -403,7 +417,7 @@ private:
int enqueue_command(int a, int b, int c, int d, int e, int f, int g);
int enqueue_trigger(int sound, int marker);
int query_queue(int param);
Player *get_player_byid(int id);
Player *findActivePlayer (int id);
int get_volchan_entry(uint a);
int set_volchan_entry(uint a, uint b);
@ -422,9 +436,7 @@ private:
static void midiTimerCallback (void *data);
public:
IMuseInternal() {
memset(this,0,sizeof(IMuseInternal));
}
IMuseInternal();
~IMuseInternal();
int initialize(OSystem *syst, MidiDriver *midi);

764
scumm/imuse_player.cpp
View file

File diff suppressed because it is too large Load diff

5
scumm/saveload.h
View file

@ -37,10 +37,11 @@ enum {
VER_V15,
VER_V16,
VER_V17,
VER_V18
VER_V18,
VER_V19
};
#define CURRENT_VER VER_V18
#define CURRENT_VER VER_V19
// To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types,

2
scumm/script_v6.cpp
View file

@ -2647,7 +2647,7 @@ void Scumm_v6::o6_kernelSetFunctions() {
break;
case 124: /* samnmax */
warning("o6_kernelSetFunctions: _saveSound=%d", args[1]);
// warning("o6_kernelSetFunctions: _saveSound=%d", args[1]);
_saveSound = args[1];
break;

5
sound/mididrv.h
View file

@ -29,8 +29,9 @@ class MidiChannel;
// Abstract MIDI Driver Class
class MidiDriver {
public:
virtual ~MidiDriver() { }
// Error codes returned by open.
// Can be converted to a string with getErrorName()
enum {
@ -41,7 +42,7 @@ public:
};
enum {
PROP_TIMEDIV = 1,
// PROP_TIMEDIV = 1,
PROP_OLD_ADLIB = 2
};

212
sound/midiparser.cpp
View file

@ -26,6 +26,8 @@
#include <stdio.h>
#include <memory.h>
//////////////////////////////////////////////////
//
// MidiParser implementation
@ -42,15 +44,10 @@ _autoLoop (false),
_smartJump (false),
_num_tracks (0),
_active_track (255),
_play_pos (0),
_play_time (0),
_play_tick (0),
_last_event_time (0),
_last_event_tick (0),
_running_status (0),
_abort_parse (0),
_hanging_notes_count (0)
{
memset (_active_notes, 0, 128);
memset (_active_notes, 0, sizeof(_active_notes));
}
void MidiParser::property (int prop, int value) {
@ -62,6 +59,12 @@ void MidiParser::property (int prop, int value) {
}
}
void MidiParser::setTempo (uint32 tempo) {
_tempo = tempo;
if (_ppqn)
_psec_per_tick = (tempo + (_ppqn >> 2)) / _ppqn;
}
// This is the conventional (i.e. SMF) variable length quantity
uint32 MidiParser::readVLQ (byte * &data) {
byte str;
@ -137,10 +140,11 @@ void MidiParser::onTimer() {
uint32 end_time;
uint32 event_time;
if (!_play_pos || !_driver)
if (!_position._play_pos || !_driver)
return;
end_time = _play_time + _timer_rate;
_abort_parse = false;
end_time = _position._play_time + _timer_rate;
// Scan our hanging notes for any
// that should be turned off.
@ -160,18 +164,18 @@ void MidiParser::onTimer() {
}
}
while (true) {
while (!_abort_parse) {
EventInfo &info = _next_event;
event_time = _last_event_time + info.delta * _psec_per_tick;
event_time = _position._last_event_time + info.delta * _psec_per_tick;
if (event_time > end_time)
break;
// Process the next info.
_last_event_tick += info.delta;
_position._last_event_tick += info.delta;
if (info.event < 0x80) {
printf ("ERROR! Bad command or running status %02X\n", info.event);
_play_pos = 0;
_position._play_pos = 0;
return;
}
@ -185,17 +189,16 @@ void MidiParser::onTimer() {
// as well as sending it to the output device.
allNotesOff();
if (_autoLoop) {
_play_pos = _tracks[_active_track];
_position._play_pos = _tracks[_active_track];
parseNextEvent (_next_event);
} else {
_play_pos = 0;
_position._play_pos = 0;
_driver->metaEvent (info.ext.type, info.ext.data, (uint16) info.length);
}
return;
} else if (info.ext.type == 0x51) {
if (info.length >= 3) {
_tempo = info.ext.data[0] << 16 | info.ext.data[1] << 8 | info.ext.data[2];
_psec_per_tick = (_tempo + (_ppqn >> 2)) / _ppqn;
setTempo (info.ext.data[0] << 16 | info.ext.data[1] << 8 | info.ext.data[2]);
}
}
_driver->metaEvent (info.ext.type, info.ext.data, (uint16) info.length);
@ -212,12 +215,16 @@ void MidiParser::onTimer() {
}
_last_event_time = event_time;
parseNextEvent (_next_event);
if (!_abort_parse) {
_position._last_event_time = event_time;
parseNextEvent (_next_event);
}
}
_play_time = end_time;
_play_tick = (_play_time - _last_event_time) / _psec_per_tick + _last_event_tick;
if (!_abort_parse) {
_position._play_time = end_time;
_position._play_tick = (_position._play_time - _position._last_event_time) / _psec_per_tick + _position._last_event_tick;
}
}
void MidiParser::allNotesOff() {
@ -230,18 +237,11 @@ void MidiParser::allNotesOff() {
for (i = 0; i < ARRAYSIZE(_hanging_notes); ++i)
_hanging_notes[i].time_left = 0;
_hanging_notes_count = 0;
memset (_active_notes, 0, 128);
memset (_active_notes, 0, sizeof(_active_notes));
}
void MidiParser::resetTracking() {
_play_pos = 0;
_tempo = 500000;
_psec_per_tick = 500000 / _ppqn;
_play_time = 0;
_play_tick = 0;
_last_event_time = 0;
_last_event_tick = 0;
_running_status = 0;
_position.clear();
}
bool MidiParser::setTrack (int track) {
@ -250,79 +250,107 @@ bool MidiParser::setTrack (int track) {
else if (track == _active_track)
return true;
if (_smartJump)
hangAllActiveNotes();
else
allNotesOff();
resetTracking();
allNotesOff();
_active_track = track;
_play_pos = _tracks[track];
_position._play_pos = _tracks[track];
parseNextEvent (_next_event);
return true;
}
void MidiParser::jumpToTick (uint32 tick) {
void MidiParser::hangAllActiveNotes() {
// Search for note off events until we have
// accounted for every active note.
uint32 advance_tick = _position._last_event_tick;
while (true) {
int i;
for (i = 0; i < 128; ++i)
if (_active_notes[i] != 0) break;
if (i == 128) break;
parseNextEvent (_next_event);
advance_tick += _next_event.delta;
if (_next_event.command() == 0x8) {
if (_active_notes [_next_event.basic.param1] & (1 << _next_event.channel())) {
hangingNote (_next_event.channel(), _next_event.basic.param1, (advance_tick - _position._last_event_tick) * _psec_per_tick);
_active_notes [_next_event.basic.param1] &= ~ (1 << _next_event.channel());
}
} else if (_next_event.event == 0xFF && _next_event.ext.type == 0x2F) {
printf ("MidiParser::hangAllActiveNotes(): Hit End of Track with active notes left!\n");
memset (_active_notes, 0, sizeof (_active_notes));
break;
}
}
}
bool MidiParser::jumpToTick (uint32 tick, bool fireEvents) {
if (_active_track >= _num_tracks)
return;
return false;
Tracker currentPos (_position);
EventInfo currentEvent (_next_event);
resetTracking();
_position._play_pos = _tracks[_active_track];
parseNextEvent (_next_event);
if (tick > 0) {
while (true) {
EventInfo &info = _next_event;
if (_position._last_event_tick + info.delta >= tick) {
_position._play_time += (tick - _position._last_event_tick) * _psec_per_tick;
_position._play_tick = tick;
break;
}
_position._last_event_tick += info.delta;
_position._last_event_time += info.delta * _psec_per_tick;
_position._play_tick = _position._last_event_tick;
_position._play_time = _position._last_event_time;
if (info.event == 0xFF) {
if (info.ext.type == 0x2F) { // End of track
if (_autoLoop) {
_position._play_pos = _tracks[_active_track];
parseNextEvent (_next_event);
} else {
_position = currentPos;
_next_event = currentEvent;
return false;
}
break;
} else if (info.ext.type == 0x51) { // Tempo
if (info.length >= 3) {
setTempo (info.ext.data[0] << 16 | info.ext.data[1] << 8 | info.ext.data[2]);
}
}
} else if (fireEvents) {
if (info.event == 0xF0)
_driver->sysEx (info.ext.data, (uint16) info.length);
else
_driver->send (info.event | info.basic.param1 << 8 | info.basic.param2 << 16);
}
parseNextEvent (_next_event);
}
}
if (!_smartJump) {
allNotesOff();
} else {
// Search for note off events until we have
// accounted for every active note.
uint32 advance_tick = _last_event_tick;
while (true) {
int i;
for (i = 0; i < 128; ++i)
if (_active_notes[i] != 0) break;
if (i == 128) break;
parseNextEvent (_next_event);
advance_tick += _next_event.delta;
if (_next_event.command() == 0x8) {
if (_active_notes [_next_event.basic.param1] & (1 << _next_event.channel())) {
hangingNote (_next_event.channel(), _next_event.basic.param1, (advance_tick - _last_event_tick) * _psec_per_tick);
_active_notes [_next_event.basic.param1] &= ~ (1 << _next_event.channel());
}
} else if (_next_event.event == 0xFF && _next_event.ext.type == 0x2F) {
break;
}
}
EventInfo targetEvent (_next_event);
Tracker targetPosition (_position);
_position = currentPos;
_next_event = currentEvent;
hangAllActiveNotes();
_next_event = targetEvent;
_position = targetPosition;
}
resetTracking();
_play_pos = _tracks[_active_track];
parseNextEvent (_next_event);
if (tick == 0)
return;
while (true) {
EventInfo &info = _next_event;
if (_last_event_tick + info.delta >= tick) {
_play_time += (tick - _last_event_tick) * _psec_per_tick;
_play_tick = tick;
break;
}
_last_event_tick += info.delta;
_play_tick = _last_event_tick;
_play_time += info.delta * _psec_per_tick;
_last_event_time = _play_time;
if (info.event == 0xFF) {
if (info.ext.type == 0x2F) { // End of track
if (_autoLoop) {
_play_pos = _tracks[_active_track];
parseNextEvent (_next_event);
} else {
_play_pos = 0;
_driver->metaEvent (0x2F, info.ext.data, (uint16) info.length);
}
break;
} else if (info.ext.type == 0x51) { // Tempo
if (info.length >= 3) {
_tempo = info.ext.data[0] << 16 | info.ext.data[1] << 8 | info.ext.data[2];
_psec_per_tick = (_tempo + (_ppqn >> 2)) / _ppqn;
}
}
}
parseNextEvent (_next_event);
}
_abort_parse = true;
return true;
}

63
sound/midiparser.h
View file

@ -28,6 +28,43 @@ class MidiParser;
class MidiDriver;
//////////////////////////////////////////////////
//
// Support entities
//
//////////////////////////////////////////////////
struct Tracker {
byte * _play_pos;
uint32 _play_time;
uint32 _play_tick;
uint32 _last_event_time;
uint32 _last_event_tick;
byte _running_status;
Tracker() { clear(); }
Tracker (const Tracker &copy) :
_play_pos (copy._play_pos),
_play_time (copy._play_time),
_play_tick (copy._play_tick),
_last_event_time (copy._last_event_time),
_last_event_tick (copy._last_event_tick),
_running_status (copy._running_status)
{ }
void clear() {
_play_pos = 0;
_play_time = 0;
_play_tick = 0;
_last_event_time = 0;
_last_event_tick = 0;
_running_status = 0;
}
};
struct EventInfo {
byte * start; // Points to delta
uint32 delta;
@ -55,6 +92,15 @@ struct NoteTimer {
NoteTimer() : channel(0), note(0), time_left(0) {}
};
//////////////////////////////////////////////////
//
// MidiParser declaration
//
//////////////////////////////////////////////////
class MidiParser {
private:
uint16 _active_notes[128]; // Each uint16 is a bit mask for channels that have that note on
@ -70,17 +116,13 @@ protected:
bool _autoLoop; // For lightweight clients that don't monitor events
bool _smartJump; // Support smart expiration of hanging notes when jumping
byte * _tracks[16];
byte * _tracks[32];
byte _num_tracks;
byte _active_track;
byte * _play_pos;
uint32 _play_time;
uint32 _play_tick;
uint32 _last_event_time;
uint32 _last_event_tick;
byte _running_status;
Tracker _position;
EventInfo _next_event;
bool _abort_parse; // If a jump or some other interruption occurs
protected:
static uint32 readVLQ (byte * &data);
@ -90,6 +132,7 @@ protected:
void activeNote (byte channel, byte note, bool active);
void hangingNote (byte channel, byte note, uint32 ticks_left);
void hangAllActiveNotes();
// Multi-byte read helpers
uint32 read4high (byte * &data) {
@ -121,11 +164,13 @@ public:
virtual void property (int prop, int value);
void setMidiDriver (MidiDriver *driver) { _driver = driver; }
void setTimerRate (uint32 rate) { _timer_rate = rate / 500; }
void setTimerRate (uint32 rate) { _timer_rate = rate; }
void setTempo (uint32 tempo);
void onTimer();
bool setTrack (int track);
void jumpToTick (uint32 tick);
bool jumpToTick (uint32 tick, bool fireEvents = false);
uint32 getTick() { return _position._play_tick; }
static MidiParser *createParser_SMF();
static MidiParser *createParser_XMIDI();

43
sound/midiparser_smf.cpp
View file

@ -80,8 +80,8 @@ void MidiParser_SMF::property (int prop, int value) {
}
void MidiParser_SMF::parseNextEvent (EventInfo &info) {
info.start = _play_pos;
info.delta = readVLQ (_play_pos);
info.start = _position._play_pos;
info.delta = readVLQ (_position._play_pos);
// Process the next info. If mpMalformedPitchBends
// was set, we must skip over any pitch bend events
@ -89,23 +89,24 @@ void MidiParser_SMF::parseNextEvent (EventInfo &info) {
// real pitch bend events, they're just two-byte
// prefixes before the real info.
do {
if ((_play_pos[0] & 0xF0) >= 0x80)
info.event = *(_play_pos++);
if ((_position._play_pos[0] & 0xF0) >= 0x80)
info.event = *(_position._play_pos++);
else
info.event = _running_status;
} while (_malformedPitchBends && (info.event & 0xF0) == 0xE0 && _play_pos++);
info.event = _position._running_status;
} while (_malformedPitchBends && (info.event & 0xF0) == 0xE0 && _position._play_pos++);
if (info.event < 0x80)
return;
_position._running_status = info.event;
switch (info.command()) {
case 0xC: case 0xD:
info.basic.param1 = *(_play_pos++);
info.basic.param1 = *(_position._play_pos++);
info.basic.param2 = 0;
break;
case 0x8: case 0x9: case 0xA: case 0xB: case 0xE:
info.basic.param1 = *(_play_pos++);
info.basic.param2 = *(_play_pos++);
info.basic.param1 = *(_position._play_pos++);
info.basic.param2 = *(_position._play_pos++);
if (info.command() == 0x9 && info.basic.param2 == 0)
info.event = info.channel() | 0x80;
info.length = 0;
@ -114,12 +115,12 @@ void MidiParser_SMF::parseNextEvent (EventInfo &info) {
case 0xF: // System Common, Meta or SysEx event
switch (info.event & 0x0F) {
case 0x2: // Song Position Pointer
info.basic.param1 = *(_play_pos++);
info.basic.param2 = *(_play_pos++);
info.basic.param1 = *(_position._play_pos++);
info.basic.param2 = *(_position._play_pos++);
break;
case 0x3: // Song Select
info.basic.param1 = *(_play_pos++);
info.basic.param1 = *(_position._play_pos++);
info.basic.param2 = 0;
break;
@ -128,16 +129,16 @@ void MidiParser_SMF::parseNextEvent (EventInfo &info) {
break;
case 0x0: // SysEx
info.length = readVLQ (_play_pos);
info.ext.data = _play_pos;
_play_pos += info.length;
info.length = readVLQ (_position._play_pos);
info.ext.data = _position._play_pos;
_position._play_pos += info.length;
break;
case 0xF: // META event
info.ext.type = *(_play_pos++);
info.length = readVLQ (_play_pos);
info.ext.data = _play_pos;
_play_pos += info.length;
info.ext.type = *(_position._play_pos++);
info.length = readVLQ (_position._play_pos);
info.ext.data = _position._play_pos;
_position._play_pos += info.length;
break;
}
}
@ -192,8 +193,8 @@ bool MidiParser_SMF::loadMusic (byte *data, uint32 size) {
}
// Now we identify and store the location for each track.
if (_num_tracks > 16) {
printf ("Can only handle 16 tracks but was handed %d\n", (int) _num_tracks);
if (_num_tracks > ARRAYSIZE(_tracks)) {
printf ("Can only handle %d tracks but was handed %d\n", (int) ARRAYSIZE(_tracks), (int) _num_tracks);
return false;
}

42
sound/midiparser_xmidi.cpp
View file

@ -76,17 +76,17 @@ uint32 MidiParser_XMIDI::readVLQ2 (byte * &pos) {
}
void MidiParser_XMIDI::parseNextEvent (EventInfo &info) {
info.start = _play_pos;
info.delta = readVLQ2 (_play_pos) - _inserted_delta;
info.start = _position._play_pos;
info.delta = readVLQ2 (_position._play_pos) - _inserted_delta;
// Process the next event.
_inserted_delta = 0;
info.event = *(_play_pos++);
info.event = *(_position._play_pos++);
switch (info.event >> 4) {
case 0x9: // Note On
info.basic.param1 = *(_play_pos++);
info.basic.param2 = *(_play_pos++);
info.length = readVLQ (_play_pos);
info.basic.param1 = *(_position._play_pos++);
info.basic.param2 = *(_position._play_pos++);
info.length = readVLQ (_position._play_pos);
if (info.basic.param2 == 0) {
info.event = info.channel() | 0x80;
info.length = 0;
@ -94,24 +94,24 @@ void MidiParser_XMIDI::parseNextEvent (EventInfo &info) {
break;
case 0xC: case 0xD:
info.basic.param1 = *(_play_pos++);
info.basic.param1 = *(_position._play_pos++);
info.basic.param2 = 0;
break;
case 0x8: case 0xA: case 0xB: case 0xE:
info.basic.param1 = *(_play_pos++);
info.basic.param2 = *(_play_pos++);
info.basic.param1 = *(_position._play_pos++);
info.basic.param2 = *(_position._play_pos++);
break;
case 0xF: // Meta or SysEx event
switch (info.event & 0x0F) {
case 0x2: // Song Position Pointer
info.basic.param1 = *(_play_pos++);
info.basic.param2 = *(_play_pos++);
info.basic.param1 = *(_position._play_pos++);
info.basic.param2 = *(_position._play_pos++);
break;
case 0x3: // Song Select
info.basic.param1 = *(_play_pos++);
info.basic.param1 = *(_position._play_pos++);
info.basic.param2 = 0;
break;
@ -120,16 +120,16 @@ void MidiParser_XMIDI::parseNextEvent (EventInfo &info) {
break;
case 0x0: // SysEx
info.length = readVLQ (_play_pos);
info.ext.data = _play_pos;
_play_pos += info.length;
info.length = readVLQ (_position._play_pos);
info.ext.data = _position._play_pos;
_position._play_pos += info.length;
break;
case 0xF: // META event
info.ext.type = *(_play_pos++);
info.length = readVLQ (_play_pos);
info.ext.data = _play_pos;
_play_pos += info.length;
info.ext.type = *(_position._play_pos++);
info.length = readVLQ (_position._play_pos);
info.ext.data = _position._play_pos;
_position._play_pos += info.length;
if (info.ext.type == 0x51 && info.length == 3) {
// Tempo event. We want to make these constant 500,000.
info.ext.data[0] = 0x07;
@ -236,8 +236,8 @@ bool MidiParser_XMIDI::loadMusic (byte *data, uint32 size) {
// Ok it's an XMIDI.
// We're going to identify and store the location for each track.
if (_num_tracks > 16) {
printf ("Can only handle 16 tracks but was handed %d\n", (int) _num_tracks);
if (_num_tracks > ARRAYSIZE(_tracks)) {
printf ("Can only handle %d tracks but was handed %d\n", (int) ARRAYSIZE(_tracks), (int) _num_tracks);
return false;
}

2
sound/mpu401.h
View file

@ -88,7 +88,7 @@ public:
MidiDriver_MPU401();
void setTimerCallback(void *timer_param, void (*timer_proc) (void *));
uint32 getBaseTempo(void) { return 0x4A0000; }
uint32 getBaseTempo(void) { return 10000; } // 0x4A0000; } // Now referenced in microseconds between callbacks
virtual void sysEx_customInstrument (byte channel, uint32 type, byte *instr);