diff options
author | David Robillard <d@drobilla.net> | 2009-02-15 20:31:05 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2009-02-15 20:31:05 +0000 |
commit | 59972b5550b0dbfb738a1acfd46c5764f96a3da5 (patch) | |
tree | a33e3212899947c83b5f59d6c5e549e923d0f914 /gtk2_ardour/midi_streamview.cc | |
parent | 9c89a93e4f96826bec6ed519f8f435e4fc73bfa5 (diff) |
Factor out region layering.
Correctly layer automation regions to match the stacking of their 'real' counterparts.
git-svn-id: svn://localhost/ardour2/branches/3.0@4585 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/midi_streamview.cc')
-rw-r--r-- | gtk2_ardour/midi_streamview.cc | 55 |
1 files changed, 5 insertions, 50 deletions
diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 178919a32c..5bb232bded 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -236,7 +236,7 @@ MidiStreamView::redisplay_diskstream () return; } - list<RegionView*>::iterator i, tmp; + list<RegionView*>::iterator i; // Load models if necessary, and find note range of all our contents _range_dirty = false; @@ -264,60 +264,15 @@ MidiStreamView::redisplay_diskstream () (*i)->enable_display(false); } - // Add and display region views, and flag existing ones as valid + // Add and display region views, and flag them as valid _trackview.get_diskstream()->playlist()->foreach_region( static_cast<StreamView*>(this), &StreamView::add_region_view); - // Build a list of region views sorted by layer, and remove invalids - RegionViewList copy; - for (i = region_views.begin(); i != region_views.end(); ) { - tmp = i; - tmp++; - - if (!(*i)->is_valid()) { - delete *i; - region_views.erase (i); - i = tmp; - continue; - } - - if (copy.size() == 0) { - copy.push_front((*i)); - i = tmp; - continue; - } - - RegionViewList::iterator k = copy.begin(); - RegionViewList::iterator l = copy.end(); - l--; - - if ((*i)->region()->layer() <= (*k)->region()->layer()) { - copy.push_front((*i)); - i = tmp; - continue; - } else if ((*i)->region()->layer() >= (*l)->region()->layer()) { - copy.push_back((*i)); - i = tmp; - continue; - } - - for (RegionViewList::iterator j = copy.begin(); j != copy.end(); ++j) { - if ((*j)->region()->layer() >= (*i)->region()->layer()) { - copy.insert(j, (*i)); - break; - } - } + // Stack regions by layer, and remove invalid regions + layer_regions(); - i = tmp; - } - - // Fix canvas layering by raising each in the sorted list order - for (RegionViewList::iterator j = copy.begin(); j != copy.end(); ++j) { - region_layered (*j); - } - - // Update note range (not to regions which are already good) and draw note lines + // Update note range (not regions which are correct) and draw note lines apply_note_range(_lowest_note, _highest_note, false); } |