ardour/livetrax
13
0
Fork 0
Code

midi regon view: fix logic error introduced when redisplay was split between model_changed and view_changed

Browse Source
This commit is contained in:
Paul Davis 2022-04-17 12:02:18 -06:00
parent f888d3d8ee
commit 3315a6588a
1 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gtk2_ardour/midi_region_view.cc
View File

@ -1170,21 +1170,28 @@ MidiRegionView::model_changed()
i = _events.erase (i); i = _events.erase (i);
} else { } else {
bool visible = cne->item()->visible();
if ((sus = dynamic_cast<Note*>(cne))) { bool visible;
if (note_in_region_range (cne->note(), visible)) {
if (visible) { if (visible) {
update_sustained (sus); cne->item()->show ();
if ((sus = dynamic_cast<Note*>(cne))) {
update_sustained (sus);
} else if ((hit = dynamic_cast<Hit*>(cne))) {
update_hit (hit);
}
} else {
cne->item()->hide ();
} }
} else if ((hit = dynamic_cast<Hit*>(cne))) { } else {
if (visible) {
update_hit (hit);
}
cne->item()->hide ();
} }
++i; ++i;
} }
} }
@ -1266,13 +1273,25 @@ MidiRegionView::view_changed()
for (Events::iterator i = _events.begin(); i != _events.end(); ) { for (Events::iterator i = _events.begin(); i != _events.end(); ) {
NoteBase* cne = i->second; NoteBase* cne = i->second;
bool visible;
if (cne->item()->visible()) { if (note_in_region_range (cne->note(), visible)) {
if ((sus = dynamic_cast<Note*>(cne))) {
update_sustained (sus); if (visible) {
cne->item()->show ();
if ((sus = dynamic_cast<Note*>(cne))) {
update_sustained (sus);
} else if ((hit = dynamic_cast<Hit*>(cne))) {
update_hit (hit);
}
} else {
cne->item()->hide ();
} }
} else if ((hit = dynamic_cast<Hit*>(cne))) {
update_hit (hit); } else {
cne->item()->hide ();
} }
++i; ++i;