X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpan_automation_time_axis.cc;h=fcef6f812c9e45bdb6e420fec3085f6449ae00f5;hb=959438031cf5fe15fef1145c6e5970fdba4e2f35;hp=587a42f3e5b450201538bec2eee6ea4ac0b8d12c;hpb=e493b2b7c4fbbbfc457f02babf9546289b430177;p=ardour.git

diff --git a/gtk2_ardour/pan_automation_time_axis.cc b/gtk2_ardour/pan_automation_time_axis.cc
index 587a42f3e5..fcef6f812c 100644
--- a/gtk2_ardour/pan_automation_time_axis.cc
+++ b/gtk2_ardour/pan_automation_time_axis.cc
@@ -26,17 +26,23 @@
 
 #include "pan_automation_time_axis.h"
 #include "automation_line.h"
+#include "canvas_impl.h"
 
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtk;
 
-PanAutomationTimeAxisView::PanAutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& parent, Widget* p, 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, p, n, X_("pan"), "")
+	  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);
 }
 
 PanAutomationTimeAxisView::~PanAutomationTimeAxisView ()
@@ -44,26 +50,31 @@ PanAutomationTimeAxisView::~PanAutomationTimeAxisView ()
 }
 
 void
-PanAutomationTimeAxisView::add_automation_event (GtkCanvasItem* item, GdkEvent* event, jack_nframes_t when, double y)
+PanAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, jack_nframes_t when, double y)
 {
 	if (lines.empty()) {
 		/* no data, possibly caused by no outputs/inputs */
 		return;
 	}
 
+	int line_index = 0;
+
 	if (lines.size() > 1) {
+		line_index = multiline_selector.get_active_row_number();
 
-		Gtkmm2ext::PopUp* msg = new Gtkmm2ext::PopUp (Gtk::WIN_POS_MOUSE, 5000, true);
-		
-		msg->set_text (_("You can't graphically edit panning of more than stream"));
-		msg->touch ();
+		if (line_index < 0 || line_index >= (int)lines.size()) {
+			Gtkmm2ext::PopUp* msg = new Gtkmm2ext::PopUp (Gtk::WIN_POS_MOUSE, 5000, true);
 		
-		return;
+			msg->set_text (_("You need to select which line to edit"));
+			msg->touch ();
+
+			return;
+		}
 	}
 
 	double x = 0;
 
-	gtk_canvas_item_w2i (canvas_display, &x, &y);
+	canvas_display->w2i (x, y);
 
 	/* compute vertical fractional position */
 
@@ -73,20 +84,63 @@ PanAutomationTimeAxisView::add_automation_event (GtkCanvasItem* item, GdkEvent*
 
 	lines.front()->view_to_model_y (y);
 
-	AutomationList& alist (lines.front()->the_list());
+	AutomationList& alist (lines[line_index]->the_list());
 
 	_session.begin_reversible_command (_("add pan automation event"));
 	_session.add_undo (alist.get_memento());
 	alist.add (when, y);
-	_session.add_undo (alist.get_memento());
+	_session.add_redo_no_execute (alist.get_memento());
 	_session.commit_reversible_command ();
 	_session.set_dirty ();
 }
 
+void
+PanAutomationTimeAxisView::clear_lines ()
+{
+	AutomationTimeAxisView::clear_lines();
+	multiline_selector.clear();
+}
+
+void
+PanAutomationTimeAxisView::add_line (AutomationLine& line)
+{
+	char buf[32];
+	snprintf(buf,32,"Line %ld",lines.size()+1);
+	multiline_selector.append_text(buf);
+
+	if (lines.empty()) {
+		multiline_selector.set_active(0);
+	}
+
+	if (lines.size() + 1 > 1) {
+		multiline_selector.show();
+	}
+
+	AutomationTimeAxisView::add_line(line);
+}
+
+void
+PanAutomationTimeAxisView::set_height (TimeAxisView::TrackHeight th)
+{
+	AutomationTimeAxisView::set_height(th);
+
+	switch (th) {
+		case Largest:
+		case Large:
+		case Larger:
+		case Normal:
+			multiline_selector.show();
+			break;
+
+		default:
+			multiline_selector.hide();
+	}
+}
+
 void
 PanAutomationTimeAxisView::set_automation_state (AutoState state)
 {
 	if (!ignore_state_request) {
-		route.panner().set_automation_state (state);
+		route->panner().set_automation_state (state);
 	}
 }