X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.cc;h=19f6ee65bbd4c266b7bc4ee1fbf0f4ee5f2647fc;hb=18f465393b29c98904a2140132131950963c36b1;hp=2fce87fa80b60c40717e15c025d2e2ed9042b85e;hpb=b1775149307a157444c516693ad6b98a404ef1b2;p=ardour.git

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 2fce87fa80..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"
 
@@ -324,23 +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 ();
 
-	/* 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 ()
 {
@@ -546,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);
 		}
 	}
@@ -613,6 +613,8 @@ StreamView::update_contents_height ()
 			break;
 		}
 	}
+
+	ContentsHeightChanged (); /* EMIT SIGNAL */
 }
 
 void