X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=d5276e0cc511fd2acdd07a6d7f6e365dcef76bd7;hb=6129b3492d3e47f7c027278f795ebb5cbea53cca;hp=60552ce14eaafb4d3dbb5742ff4faf7d1a81b84d;hpb=99054ea415c8a28227024bc27152fdf30379bdf9;p=ardour.git

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 60552ce14e..d5276e0cc5 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -91,12 +91,26 @@ AutomationTimeAxisView::AutomationTimeAxisView (
 	, _automatable (a)
 	, _parameter (p)
 	, _base_rect (new ArdourCanvas::Rectangle (_canvas_display))
-	, _name (nom)
 	, _view (show_regions ? new AutomationStreamView (*this) : 0)
 	, auto_button (X_("")) /* force addition of a label */
 	, _show_regions (show_regions)
 {
+	//concatenate plugin name and param name into the tooltip
+	string tipname = nomparent;
+	if (!tipname.empty()) {
+		tipname += ": ";
+	}
+	tipname += nom;
+	ARDOUR_UI::instance()->set_tip(controls_ebox, tipname);
 
+	//plugin name and param name appear on 2 separate lines in the track header
+	tipname = nomparent;
+	if (!tipname.empty()) {
+		tipname += "\n";
+	}
+	tipname += nom;
+	_name = tipname;
+	
 	CANVAS_DEBUG_NAME (_canvas_display, string_compose ("main for auto %2/%1", _name, r->name()));
 	CANVAS_DEBUG_NAME (selection_group, string_compose ("selections for auto %2/%1", _name, r->name()));
 	CANVAS_DEBUG_NAME (_ghost_group, string_compose ("ghosts for auto %2/%1", _name, r->name()));
@@ -135,7 +149,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
 		_base_rect->lower_to_bottom();
 	}
 
-	hide_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::CloseCross));
+	hide_button.set_icon (ArdourIcon::CloseCross);
 	hide_button.set_tweaks(ArdourButton::TrackHeader);
 
 	auto_button.set_name ("route button");
@@ -170,13 +184,6 @@ AutomationTimeAxisView::AutomationTimeAxisView (
 	name_label.set_name (X_("TrackParameterName"));
 	name_label.set_ellipsize (Pango::ELLIPSIZE_END);
 
-	string tipname = nomparent;
-	if (!tipname.empty()) {
-		tipname += ": ";
-	}
-	tipname += _name;
-	ARDOUR_UI::instance()->set_tip(controls_ebox, tipname);
-
 	/* add the buttons */
 	controls_table.set_border_width (1);
 	controls_table.remove (name_hbox);
@@ -278,6 +285,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
 
 AutomationTimeAxisView::~AutomationTimeAxisView ()
 {
+	cleanup_gui_properties ();
 	delete _view;
 }
 
@@ -441,24 +449,24 @@ AutomationTimeAxisView::clear_clicked ()
 	} else if (_view) {
 		_view->clear ();
 	}
-
+	set_automation_state ((AutoState) ARDOUR::Off);
 	_editor.commit_reversible_command ();
 	_session->set_dirty ();
 }
 
 void
-AutomationTimeAxisView::set_height (uint32_t h)
+AutomationTimeAxisView::set_height (uint32_t h, TrackHeightMode m)
 {
 	bool const changed = (height != (uint32_t) h) || first_call_to_set_height;
 	uint32_t const normal = preset_height (HeightNormal);
 	bool const changed_between_small_and_normal = ( (height < normal && h >= normal) || (height >= normal || h < normal) );
 
-	TimeAxisView::set_height (h);
+	TimeAxisView::set_height (h, m);
 
 	_base_rect->set_y1 (h);
 
 	if (_line) {
-		_line->set_height(h);
+		_line->set_height(h - 2.5);
 	}
 
 	if (_view) {
@@ -471,7 +479,10 @@ AutomationTimeAxisView::set_height (uint32_t h)
 		first_call_to_set_height = false;
 
 		if (h >= preset_height (HeightNormal)) {
-			auto_button.show();
+			if (!(_parameter.type() >= MidiCCAutomation &&
+			      _parameter.type() <= MidiChannelPressureAutomation)) {
+				auto_button.show();
+			}
 			name_label.show();
 			hide_button.show();
 
@@ -560,7 +571,10 @@ AutomationTimeAxisView::build_display_menu ()
 			(AutoState) Touch)));
 	auto_touch_item = dynamic_cast<Gtk::CheckMenuItem*>(&as_items.back());
 
-	items.push_back (MenuElem (_("State"), *auto_state_menu));
+	if (!(_parameter.type() >= MidiCCAutomation &&
+	      _parameter.type() <= MidiChannelPressureAutomation)) {
+		items.push_back (MenuElem (_("State"), *auto_state_menu));
+	}
 
 	/* mode menu */
 
@@ -630,10 +644,10 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when,
 	_editor.begin_reversible_command (_("add automation event"));
 	XMLNode& before = list->get_state();
 
-	list->add (when, y, with_guard_points);
+	list->editor_add (when, y, with_guard_points);
 
 	XMLNode& after = list->get_state();
-	_session->add_command (new MementoCommand<ARDOUR::AutomationList> (*list, &before, &after));
+	_session->add_command (new MementoCommand<ARDOUR::AutomationList> (*list.get (), &before, &after));
 	_editor.commit_reversible_command ();
 	_session->set_dirty ();
 }