X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.cc;h=94ed2a86f044abc8909cf70b6496e1293a8bc77f;hb=601a34521c2ce1d0167ed2f3c66f2fa6eeeb6b8e;hp=d0e116c97130c9984beb6977a91434c29c476418;hpb=52d67203a10d3223f9f283fb56803b7979a0c2bd;p=ardour.git

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index d0e116c971..94ed2a86f0 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -59,6 +59,7 @@
 
 #include "ardour_ui.h"
 #include "ardour_button.h"
+#include "audio_streamview.h"
 #include "debug.h"
 #include "global_signals.h"
 #include "route_time_axis.h"
@@ -1342,6 +1343,10 @@ RouteTimeAxisView::set_selected_points (PointSelection& points)
 	for (Children::iterator i = children.begin(); i != children.end(); ++i) {
 		(*i)->set_selected_points (points);
 	}
+	AudioStreamView* asv = dynamic_cast<AudioStreamView*>(_view);
+	if (asv) {
+		asv->set_selected_points (points);
+	}
 }
 
 void
@@ -1614,6 +1619,7 @@ RouteTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteConte
 	pos += _editor.get_paste_offset(pos, ctx.count, duration);
 
 	pl->clear_changes ();
+	pl->clear_owned_changes ();
 	if (Config->get_edit_mode() == Ripple) {
 		std::pair<framepos_t, framepos_t> extent = (*p)->get_extent_with_endspace();
 		framecnt_t amount = extent.second - extent.first;
@@ -2577,7 +2583,7 @@ RouteTimeAxisView::meter_changed ()
 {
 	ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed)
 	reset_meter();
-	if (_route && !no_redraw) {
+	if (_route && !no_redraw && ARDOUR_UI::config()->get_show_track_meters()) {
 		request_redraw ();
 	}
 	// reset peak when meter point changes
@@ -2780,7 +2786,6 @@ RouteTimeAxisView::create_trim_automation_child (const Evoral::Parameter& param,
 {
 	boost::shared_ptr<AutomationControl> c = _route->trim()->gain_control();
 	if (!c || ! _route->trim()->active()) {
-		error << "Route has no trim automation, unable to add automation track view." << endmsg;
 		return;
 	}