X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.cc;h=715eec53b4bc219234958a4df6bef520b91b8dca;hb=4aaae2eb3ba65f97e173b1751e1ee3bec8925ed5;hp=ad2ad2233d77964e849c44251467850efa810cea;hpb=e5888d398350b26ba2cdc634cc9791e90b4fc6b6;p=ardour.git

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index ad2ad2233d..715eec53b4 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -50,8 +50,11 @@
 #include "ardour/route_group.h"
 #include "ardour/session.h"
 #include "ardour/session_playlists.h"
+
 #include "evoral/Parameter.hpp"
 
+#include "canvas/debug.h"
+
 #include "ardour_ui.h"
 #include "ardour_button.h"
 #include "debug.h"
@@ -111,6 +114,10 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 {
 	RouteUI::set_route (rt);
 
+	CANVAS_DEBUG_NAME (_canvas_display, string_compose ("main for %1", rt->name()));
+	CANVAS_DEBUG_NAME (selection_group, string_compose ("selections for %1", rt->name()));
+	CANVAS_DEBUG_NAME (_ghost_group, string_compose ("ghosts for %1", rt->name()));
+
 	int meter_width = 3;
 	if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
 		meter_width = 6;
@@ -691,7 +698,7 @@ RouteTimeAxisView::build_display_menu ()
 	}
 
 	items.push_back (CheckMenuElem (_("Active")));
-	CheckMenuItem* i = dynamic_cast<CheckMenuItem *> (&items.back());
+	Gtk::CheckMenuItem* i = dynamic_cast<Gtk::CheckMenuItem *> (&items.back());
 	bool click_sets_active = true;
 	if (active > 0 && inactive == 0) {
 		i->set_active (true);
@@ -2021,12 +2028,12 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p
 	for (std::set<Evoral::Parameter>::const_iterator i = automatable.begin(); i != automatable.end(); ++i) {
 
 		ProcessorAutomationNode* pan;
-		CheckMenuItem* mitem;
+		Gtk::CheckMenuItem* mitem;
 
 		string name = processor->describe_parameter (*i);
 
 		items.push_back (CheckMenuElem (name));
-		mitem = dynamic_cast<CheckMenuItem*> (&items.back());
+		mitem = dynamic_cast<Gtk::CheckMenuItem*> (&items.back());
 		
 		_subplugin_menu_map[*i] = mitem;
 
@@ -2249,6 +2256,8 @@ RouteTimeAxisView::meter_changed ()
 	if (_route && !no_redraw) {
 		request_redraw ();
 	}
+	// reset peak when meter point changes
+	gm.reset_peak_display();
 }
 
 void