ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix completely wrong MidiRegionView::get_patch_key_at(). 

This fixes the note name displayed at a given time to be based on the correct program at that time, and not one in the future.

git-svn-id: svn://localhost/ardour2/branches/3.0@13912 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2013-01-20 02:31:41 +00:00
parent 4a47edeaf0
commit 411dd7566f
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk2_ardour/midi_region_view.cc
View File

@ -1845,16 +1845,28 @@ MidiRegionView::patch_change_to_patch_key (MidiModel::PatchChangePtr p)
return MIDI::Name::PatchPrimaryKey (p->program(), p->bank());
}
/// Return true iff @p pc applies to the given time on the given channel.
static bool
patch_applies (const ARDOUR::MidiModel::constPatchChangePtr pc, double time, uint8_t channel)
{
return pc->time() <= time && pc->channel() == channel;
}
void
MidiRegionView::get_patch_key_at (double time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key) const
{
// The earliest event not before time
MidiModel::PatchChanges::iterator i = _model->patch_change_lower_bound (time);
while (i != _model->patch_changes().end() && (*i)->channel() != channel) {
++i;
// Go backwards until we find the latest PC for this channel, or the start
while (i != _model->patch_changes().begin() &&
(i == _model->patch_changes().end() ||
!patch_applies(*i, time, channel))) {
--i;
}
if (i != _model->patch_changes().end()) {
key.bank_number = (*i)->bank();
if (patch_applies(*i, time, channel)) {
key.bank_number = (*i)->bank();
key.program_number = (*i)->program ();
} else {
key.bank_number = key.program_number = 0;