summaryrefslogtreecommitdiff
path: root/gtk2_ardour/audio_streamview.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-09-14 18:08:58 +0000
committerDavid Robillard <d@drobilla.net>2008-09-14 18:08:58 +0000
commit5befe852184c09175ce62f2df3b017b03c6999ef (patch)
tree6de87b4a914ad78a02546bb04e68cf88159f3e3d /gtk2_ardour/audio_streamview.cc
parent23a73ec6825a5c8e6ffbfd4de955a3c5bee09583 (diff)
Fix stacking of MIDI stream views to match that of audio.
Make copy and brush operations type generic (i.e. fix brushing for MIDI regions). git-svn-id: svn://localhost/ardour2/branches/3.0@3724 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_streamview.cc')
-rw-r--r--gtk2_ardour/audio_streamview.cc19
1 files changed, 8 insertions, 11 deletions
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 0e3dda0bd6..7ab0a07f6f 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -392,8 +392,9 @@ AudioStreamView::redisplay_diskstream ()
apl->foreach_crossfade (this, &AudioStreamView::add_crossfade);
}
- RegionViewList copy;
+ RegionViewList copy;
+ /* Place regions */
for (i = region_views.begin(); i != region_views.end(); ) {
tmp = i;
tmp++;
@@ -407,10 +408,8 @@ AudioStreamView::redisplay_diskstream ()
(*i)->enable_display(true);
}
- /*
- sort regionviews by layer so that when we call region_layered ()
- the canvas layering works out (in non-stacked mode).
- */
+ /* Sort regionviews by layer so that when we call region_layered ()
+ the canvas layering works out (in non-stacked mode). */
if (copy.size() == 0) {
copy.push_front((*i));
@@ -433,7 +432,6 @@ AudioStreamView::redisplay_diskstream ()
}
for (RegionViewList::iterator j = copy.begin(); j != copy.end(); ++j) {
-
if ((*j)->region()->layer() >= (*i)->region()->layer()) {
copy.insert(j, (*i));
break;
@@ -456,12 +454,11 @@ AudioStreamView::redisplay_diskstream ()
xi = tmpx;
}
- /* now fix canvas layering */
-
+ /* Fix canvas layering */
for (RegionViewList::iterator j = copy.begin(); j != copy.end(); ++j) {
- (*j)->enable_display(true);
- (*j)->set_height (height);
- region_layered (*j);
+ (*j)->enable_display(true);
+ (*j)->set_height (height);
+ region_layered (*j);
}
}