smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 00:04:56 +01:00
Code Issues Projects Releases Wiki Activity

fix various midi display bugs introduced by 9038be49d8.

Browse source
This commit is contained in:
nick_m 2016-12-21 03:18:18 +11:00
parent 1a500bc00b
commit eecc9ed743
1 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

35
gtk2_ardour/midi_region_view.cc
View file

@ -1191,10 +1191,26 @@ MidiRegionView::redisplay_model()
MidiModel::Notes missing_notes = _model->notes(); // copy MidiModel::Notes missing_notes = _model->notes(); // copy
if (!empty_when_starting) { if (!empty_when_starting) {
MidiModel::Notes::iterator f;
for (Events::iterator i = _events.begin(); i != _events.end(); ) { for (Events::iterator i = _events.begin(); i != _events.end(); ) {
boost::shared_ptr<NoteType> note ((*i)->note()); boost::shared_ptr<NoteType> note = (*i)->note();
/* if event item's note exists in the model, we can just update it.
* don't mark it as missing.
*/
if ((f = missing_notes.find (note)) != missing_notes.end()) {
if ((*f) == note) {
(*i)->validate();
missing_notes.erase (f);
} else {
(*i)->invalidate();
}
} else {
(*i)->invalidate();
}
/* remove note items that are no longer valid */ /* remove note items that are no longer valid */
if (!(*i)->valid () || !_model->find_note (note)) { if (!(*i)->valid()) {
for (vector<GhostRegion*>::iterator j = ghosts.begin(); j != ghosts.end(); ++j) { for (vector<GhostRegion*>::iterator j = ghosts.begin(); j != ghosts.end(); ++j) {
MidiGhostRegion* gr = dynamic_cast<MidiGhostRegion*> (*j); MidiGhostRegion* gr = dynamic_cast<MidiGhostRegion*> (*j);
@ -1207,7 +1223,6 @@ MidiRegionView::redisplay_model()
i = _events.erase (i); i = _events.erase (i);
} else { } else {
MidiModel::Notes::iterator f;
NoteBase* cne = (*i); NoteBase* cne = (*i);
bool visible; bool visible;
@ -1222,33 +1237,33 @@ MidiRegionView::redisplay_model()
cne->hide (); cne->hide ();
} }
if ((f = missing_notes.find (note)) != missing_notes.end()) {
missing_notes.erase (f);
}
++i; ++i;
} }
} }
} }
NoteBase* cne;
for (MidiModel::Notes::iterator n = missing_notes.begin(); n != missing_notes.end(); ++n) { for (MidiModel::Notes::iterator n = missing_notes.begin(); n != missing_notes.end(); ++n) {
boost::shared_ptr<NoteType> note (*n); boost::shared_ptr<NoteType> note (*n);
NoteBase* cne = add_note (note, true);
bool visible; bool visible;
if (note_in_region_range (note, visible)) { if (note_in_region_range (note, visible)) {
if (visible) { if (visible) {
cne = add_note (note, true);
set<Evoral::event_id_t>::iterator it; set<Evoral::event_id_t>::iterator it;
cne->show ();
for (it = _pending_note_selection.begin(); it != _pending_note_selection.end(); ++it) { for (it = _pending_note_selection.begin(); it != _pending_note_selection.end(); ++it) {
if ((*it) == note->id()) { if ((*it) == note->id()) {
add_to_selection (cne); add_to_selection (cne);
} }
} }
} else {
cne->hide ();
} }
} else {
cne->hide ();
} }
} }