X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fstreamview.cc;h=19f6ee65bbd4c266b7bc4ee1fbf0f4ee5f2647fc;hb=f750aa32070b128f5e61e5abc39855f8654fb0de;hp=55e2020874fa9d329c48b56ec14b2722a1390666;hpb=881b5a43e755860e91bf596bcac1f8c105b0a843;p=ardour.git

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 55e2020874..19f6ee65bb 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -25,7 +25,6 @@
 
 #include "ardour/playlist.h"
 #include "ardour/region.h"
-#include "ardour/source.h"
 #include "ardour/track.h"
 #include "ardour/session.h"
 
@@ -57,7 +56,6 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* background_g
 	, _samples_per_unit (_trackview.editor().get_current_zoom ())
 	, rec_updating(false)
 	, rec_active(false)
-	, region_color(_trackview.color())
 	, stream_base_color(0xFFFFFFFF)
 	, _layers (1)
 	, _layer_display (Overlaid)
@@ -182,7 +180,7 @@ StreamView::add_region_view (boost::weak_ptr<Region> wr)
 
 	add_region_view_internal (r, true);
 
-	if (_layer_display == Stacked) {
+	if (_layer_display == Stacked || _layer_display == Expanded) {
 		update_contents_height ();
 	}
 }
@@ -325,25 +323,24 @@ StreamView::playlist_switched (boost::weak_ptr<Track> wtr)
 	playlist_connections.drop_connections ();
 	undisplay_track ();
 
+	/* draw it */
+
+	redisplay_track ();
+
 	/* update layers count and the y positions and heights of our regions */
 	_layers = tr->playlist()->top_layer() + 1;
 	update_contents_height ();
 	update_coverage_frames ();
 
-	tr->playlist()->set_explicit_relayering (_layer_display == Stacked);
-
-	/* draw it */
-
-	redisplay_track ();
-
 	/* catch changes */
 
 	tr->playlist()->LayeringChanged.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::playlist_layered, this, boost::weak_ptr<Track> (tr)), gui_context());
-	tr->playlist()->RegionAdded.connect (playlist_connections, invalidator (*this), ui_bind (&StreamView::add_region_view, this, _1), gui_context());
-	tr->playlist()->RegionRemoved.connect (playlist_connections, invalidator (*this), ui_bind (&StreamView::remove_region_view, this, _1), gui_context());
-	tr->playlist()->ContentsChanged.connect (playlist_connections, invalidator (*this), ui_bind (&StreamView::update_coverage_frames, this), gui_context());
+	tr->playlist()->RegionAdded.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::add_region_view, this, _1), gui_context());
+	tr->playlist()->RegionRemoved.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::remove_region_view, this, _1), gui_context());
+	tr->playlist()->ContentsChanged.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::update_coverage_frames, this), gui_context());
 }
 
+
 void
 StreamView::diskstream_changed ()
 {
@@ -523,8 +520,21 @@ StreamView::get_selectables (framepos_t start, framepos_t end, double top, doubl
 
 	if (_layer_display == Stacked) {
 		double const c = child_height ();
-		min_layer = _layers - ((bottom - _trackview.y_position()) / c);
-		max_layer = _layers - ((top - _trackview.y_position()) / c);
+
+		int const mi = _layers - ((bottom - _trackview.y_position()) / c);
+		if (mi < 0) {
+			min_layer = 0;
+		} else {
+			min_layer = mi;
+		}
+
+		int const ma = _layers - ((top - _trackview.y_position()) / c);
+		if (ma > (int) _layers) {
+			max_layer = _layers - 1;
+		} else {
+			max_layer = ma;
+		}
+
 	}
 
 	for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
@@ -536,7 +546,7 @@ StreamView::get_selectables (framepos_t start, framepos_t end, double top, doubl
 			layer_ok = (min_layer <= l && l <= max_layer);
 		}
 
-		if ((*i)->region()->coverage (start, end) != OverlapNone && layer_ok) {
+		if ((*i)->region()->coverage (start, end) != Evoral::OverlapNone && layer_ok) {
 			results.push_back (*i);
 		}
 	}
@@ -556,10 +566,16 @@ StreamView::get_inverted_selectables (Selection& sel, list<Selectable*>& results
 double
 StreamView::child_height () const
 {
-	if (_layer_display == Stacked) {
+	switch (_layer_display) {
+	case Overlaid:
+		return height;
+	case Stacked:
 		return height / _layers;
+	case Expanded:
+		return height / (_layers * 2 + 1);
 	}
-
+	
+	/* NOTREACHED */
 	return height;
 }
 
@@ -576,6 +592,9 @@ StreamView::update_contents_height ()
 		case Stacked:
 			(*i)->set_y (height - ((*i)->region()->layer() + 1) * h);
 			break;
+		case Expanded:
+			(*i)->set_y (height - ((*i)->region()->layer() + 1) * 2 * h);
+			break;
 		}
 
 		(*i)->set_height (h);
@@ -587,21 +606,28 @@ StreamView::update_contents_height ()
 			i->rectangle->property_y2() = height;
 			break;
 		case Stacked:
+		case Expanded:
 			/* In stacked displays, the recregion is always at the top */
 			i->rectangle->property_y1() = 0;
 			i->rectangle->property_y2() = h;
 			break;
 		}
 	}
+
+	ContentsHeightChanged (); /* EMIT SIGNAL */
 }
 
 void
 StreamView::set_layer_display (LayerDisplay d)
 {
 	_layer_display = d;
+
+	if (_layer_display == Overlaid) {
+		layer_regions ();
+	}
+	
 	update_contents_height ();
 	update_coverage_frames ();
-	_trackview.track()->playlist()->set_explicit_relayering (_layer_display == Stacked);
 }
 
 void