ardour/livetrax
13
0
Fork 0
Code

Remove ghost notes when actual notes are deleted, and ensure the _optimization_iterator is valid even after things have been removed from the list (should fix #4483).

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10659 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-11-17 22:15:50 +00:00
parent 597a656418
commit fecf120f1e
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk2_ardour/ghostregion.cc
View File

@ -306,6 +306,7 @@ MidiGhostRegion::clear_events()
}
events.clear();
_optimization_iterator = events.end ();
}
/** Update the x positions of our representation of a parent's note.
@ -328,13 +329,26 @@ MidiGhostRegion::update_note (ArdourCanvas::CanvasNote* parent)
}
}
void
MidiGhostRegion::remove_note (ArdourCanvas::CanvasNoteEvent* note)
{
Event* ev = find_event (note);
if (!ev) {
return;
}
events.remove (ev);
delete ev;
_optimization_iterator = events.end ();
}
/** Given a note in our parent region (ie the actual MidiRegionView), find our
* representation of it.
* @return Our Event, or 0 if not found.
*/
MidiGhostRegion::Event *
MidiGhostRegion::find_event (ArdourCanvas::CanvasNote* parent)
MidiGhostRegion::find_event (ArdourCanvas::CanvasNoteEvent* parent)
{
/* we are using _optimization_iterator to speed up the common case where a caller
is going through our notes in order.

3
gtk2_ardour/ghostregion.h
View File

@ -105,12 +105,13 @@ public:
void add_note(ArdourCanvas::CanvasNote*);
void update_note (ArdourCanvas::CanvasNote *);
void remove_note (ArdourCanvas::CanvasNoteEvent *);
void clear_events();
private:
MidiGhostRegion::Event* find_event (ArdourCanvas::CanvasNote *);
MidiGhostRegion::Event* find_event (ArdourCanvas::CanvasNoteEvent *);
typedef std::list<MidiGhostRegion::Event*> EventList;
EventList events;

9
gtk2_ardour/midi_region_view.cc
View File

@ -1156,8 +1156,17 @@ MidiRegionView::redisplay_model()
for (Events::iterator i = _events.begin(); i != _events.end(); ) {
if (!(*i)->valid ()) {
for (vector<GhostRegion*>::iterator j = ghosts.begin(); j != ghosts.end(); ++j) {
MidiGhostRegion* gr = dynamic_cast<MidiGhostRegion*> (*j);
if (gr) {
gr->remove_note (*i);
}
}
delete *i;
i = _events.erase (i);
} else {
++i;
}