summaryrefslogtreecommitdiff
path: root/gtk2_ardour/streamview.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2009-08-26 00:06:21 +0000
committerCarl Hetherington <carl@carlh.net>2009-08-26 00:06:21 +0000
commit28af0265b5867a4ad9bd35e2d98eadd7f1264693 (patch)
tree11d63ba1b446de353c4b28f6e822d0549b2f5499 /gtk2_ardour/streamview.cc
parent33328b868dd29bfe80c8b4acc664358f8530bcd5 (diff)
When a track is in "stacked" mode, allow regions to be moved to different layers by dragging
and dropping. In stacked mode, the relayering by "recently added / moved etc. is higher" setting is ignored, and regions are put on the layer that they are dropped to, unless: 1. they are dropped so that they overlap another region on the same layer, in which case they are put on the layer above that one. 2. they are dropped such that they could be put on a lower layer with no audible difference, in which case they are put on the lower layer. git-svn-id: svn://localhost/ardour2/branches/3.0@5590 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/streamview.cc')
-rw-r--r--gtk2_ardour/streamview.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index c68985ee77..fbd48ddbf2 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -351,10 +351,12 @@ StreamView::playlist_changed (boost::shared_ptr<Diskstream> ds)
/* update layers count and the y positions and heights of our regions */
_layers = ds->playlist()->top_layer() + 1;
update_contents_height ();
-
update_coverage_frames ();
+
+ ds->playlist()->set_explicit_relayering (_layer_display == Stacked);
/* draw it */
+
redisplay_diskstream ();
/* catch changes */
@@ -571,6 +573,7 @@ StreamView::set_layer_display (LayerDisplay d)
_layer_display = d;
update_contents_height ();
update_coverage_frames ();
+ _trackview.get_diskstream()->playlist()->set_explicit_relayering (_layer_display == Stacked);
}
void