Remove unused method in RouteTimeAxisView. Fix bug with switching to layered region mode.

Optimise Playlist::relayer().


git-svn-id: svn://localhost/ardour2/branches/3.0@5572 d708f5d6-7413-0410-9779-e7cbd77b26cf

3 files changed, 5 insertions, 27 deletions

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index d8cbfbc3ea..d16f9b7a12 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -303,21 +303,6 @@ RouteTimeAxisView::post_construct ()
 	reset_processor_automation_curves ();
 }
 
-void
-RouteTimeAxisView::set_playlist (boost::shared_ptr<Playlist> /*newplaylist*/)
-{
-	boost::shared_ptr<Playlist> pl = playlist();
-	assert(pl);
-
-	modified_connection.disconnect ();
-	modified_connection = pl->Modified.connect (mem_fun(*this, &RouteTimeAxisView::playlist_modified));
-}
-
-void
-RouteTimeAxisView::playlist_modified ()
-{
-}
-
 gint
 RouteTimeAxisView::edit_click (GdkEventButton *ev)
 {
@@ -342,10 +327,6 @@ void
 RouteTimeAxisView::playlist_changed ()
 {
 	label_view ();
-
-	if (is_track()) {
-		set_playlist (get_diskstream()->playlist());
-	}
 }
 
 void
@@ -1163,7 +1144,6 @@ RouteTimeAxisView::update_diskstream_display ()
 	if (!get_diskstream()) // bus
 		return;
 
-	set_playlist (get_diskstream()->playlist());
 	map_frozen ();
 }	
 
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 45e961c69e..95cbfa8c76 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -236,11 +236,9 @@ protected:
 	void align_style_changed ();
 	void set_align_style (ARDOUR::AlignStyle);
 	
-	virtual void set_playlist (boost::shared_ptr<ARDOUR::Playlist>);
 	void         playlist_click ();
 	void         show_playlist_selector ();
 	void         playlist_changed ();
-	void         playlist_modified ();
 
 	void rename_current_playlist ();
 	
@@ -312,8 +310,6 @@ protected:
 
 	AutomationTracks _automation_tracks;
 
-	sigc::connection modified_connection;
-
 	void post_construct ();
 	
 	GainMeterBase gm;
diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 4a10708e8c..c68985ee77 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -312,11 +312,13 @@ StreamView::playlist_modified (boost::shared_ptr<Diskstream> ds)
 	ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_modified_weak), ds));
 
 	/* update layers count and the y positions and heights of our regions */
-	if (ds->playlist() && _layer_display == Stacked) {
+	if (ds->playlist()) {
 		_layers = ds->playlist()->top_layer() + 1;
+	}
+
+	if (_layer_display == Stacked) {
 		update_contents_height ();
 		update_coverage_frames ();
-		//redisplay_diskstream ();
 	}
 }
 
@@ -358,7 +360,7 @@ StreamView::playlist_changed (boost::shared_ptr<Diskstream> ds)
 	/* catch changes */
 
 	playlist_connections.push_back (ds->playlist()->Modified.connect (bind (
-			mem_fun (*this, &StreamView::playlist_modified_weak), ds)));
+	 		mem_fun (*this, &StreamView::playlist_modified_weak), ds)));
 
 	playlist_connections.push_back (ds->playlist()->RegionAdded.connect (
 			mem_fun (*this, &StreamView::add_region_view_weak)));