ardour/livetrax
13
0
Fork 0
Code

fix apparent logic error for MidiRegionView when redisplaying note model

Browse Source
This commit is contained in:
Paul Davis 2014-03-06 23:16:42 -05:00
parent 2a6fc5af74
commit 41c4c41eaa
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk2_ardour/midi_region_view.cc
View File

@ -1115,7 +1115,7 @@ MidiRegionView::redisplay_model()
MidiModel::Notes& notes (_model->notes());
_optimization_iterator = _events.begin();
bool empty_when_starting = !_events.empty();
bool empty_when_starting = _events.empty();
for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) {
@ -1124,8 +1124,8 @@ MidiRegionView::redisplay_model()
bool visible;
if (note_in_region_range (note, visible)) {
if (empty_when_starting && (cne = find_canvas_note (note)) != 0) {
if (!empty_when_starting && (cne = find_canvas_note (note)) != 0) {
cne->validate ();
@ -1150,8 +1150,8 @@ MidiRegionView::redisplay_model()
}
} else {
if (empty_when_starting && (cne = find_canvas_note (note)) != 0) {
if (!empty_when_starting && (cne = find_canvas_note (note)) != 0) {
cne->validate ();
cne->hide ();
}
@ -1161,7 +1161,7 @@ MidiRegionView::redisplay_model()
/* remove note items that are no longer valid */
if (empty_when_starting) {
if (!empty_when_starting) {
for (Events::iterator i = _events.begin(); i != _events.end(); ) {
if (!(*i)->valid ()) {
@ -1436,7 +1436,6 @@ MidiRegionView::apply_note_range (uint8_t min, uint8_t max, bool force)
cnote->set_y1 (y1);
} else if (Hit* chit = dynamic_cast<Hit*>(event)) {
update_hit (chit);
}
}