X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpan_automation_time_axis.cc;h=c484673c996136957f03a88fc35c0d9a3bf288a6;hb=aa60114843f4990ef93ba83974501495ddda358b;hp=ca6b6c7efe7af98cd7faf0041f2117c5a0f4fba2;hpb=f0484eee892027e50c2132efbaddbf974147345d;p=ardour.git

diff --git a/gtk2_ardour/pan_automation_time_axis.cc b/gtk2_ardour/pan_automation_time_axis.cc
index ca6b6c7efe..c484673c99 100644
--- a/gtk2_ardour/pan_automation_time_axis.cc
+++ b/gtk2_ardour/pan_automation_time_axis.cc
@@ -23,10 +23,12 @@
 #include <ardour/panner.h>
 
 #include <gtkmm2ext/popup.h>
+#include <pbd/memento_command.h>
 
 #include "pan_automation_time_axis.h"
 #include "automation_line.h"
 #include "canvas_impl.h"
+#include "route_ui.h"
 
 #include "i18n.h"
 
@@ -34,14 +36,15 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
 
-PanAutomationTimeAxisView::PanAutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& parent, Canvas& canvas, std::string n)
+PanAutomationTimeAxisView::PanAutomationTimeAxisView (Session& s, boost::shared_ptr<Route> r, PublicEditor& e, 
+						      TimeAxisView& parent, Canvas& canvas, std::string n)
 
 	: AxisView (s),
 	  AutomationTimeAxisView (s, r, e, parent, canvas, n, X_("pan"), "")
 {
 	multiline_selector.set_name ("PanAutomationLineSelector");
 	
-	controls_table.attach (multiline_selector, 1, 5, 1, 2, Gtk::FILL | Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+	controls_table.attach (multiline_selector, 1, 5, 1, 2, Gtk::EXPAND, Gtk::EXPAND);
 }
 
 PanAutomationTimeAxisView::~PanAutomationTimeAxisView ()
@@ -49,7 +52,7 @@ PanAutomationTimeAxisView::~PanAutomationTimeAxisView ()
 }
 
 void
-PanAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, jack_nframes_t when, double y)
+PanAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, nframes_t when, double y)
 {
 	if (lines.empty()) {
 		/* no data, possibly caused by no outputs/inputs */
@@ -86,9 +89,10 @@ PanAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEv
 	AutomationList& alist (lines[line_index]->the_list());
 
 	_session.begin_reversible_command (_("add pan automation event"));
-	_session.add_undo (alist.get_memento());
+	XMLNode &before = alist.get_state();
 	alist.add (when, y);
-	_session.add_undo (alist.get_memento());
+	XMLNode &after = alist.get_state();
+        _session.add_command(new MementoCommand<AutomationList>(alist, &before, &after));
 	_session.commit_reversible_command ();
 	_session.set_dirty ();
 }
@@ -104,15 +108,18 @@ void
 PanAutomationTimeAxisView::add_line (AutomationLine& line)
 {
 	char buf[32];
-	snprintf(buf,32,"Line %d",lines.size()+1);
+	snprintf(buf,32,"Line %zu",lines.size()+1);
 	multiline_selector.append_text(buf);
 
 	if (lines.empty()) {
 		multiline_selector.set_active(0);
 	}
 
-	if (lines.size() + 1 > 1) {
+	if (lines.size() + 1 > 1 && (height_style != Small && height_style != Smaller)) {
 		multiline_selector.show();
+	} else {
+		multiline_selector.hide();
+
 	}
 
 	AutomationTimeAxisView::add_line(line);
@@ -128,9 +135,10 @@ PanAutomationTimeAxisView::set_height (TimeAxisView::TrackHeight th)
 		case Large:
 		case Larger:
 		case Normal:
-			multiline_selector.show();
-			break;
-
+			if (lines.size() > 1) {
+				multiline_selector.show();
+				break;
+			} 
 		default:
 			multiline_selector.hide();
 	}
@@ -140,6 +148,6 @@ void
 PanAutomationTimeAxisView::set_automation_state (AutoState state)
 {
 	if (!ignore_state_request) {
-		route.panner().set_automation_state (state);
+		route->panner().set_automation_state (state);
 	}
 }