add a hack to deal with device discovery race, in which the devices were not actually known to be ready before the last update_surfaces() call (which is where binding between strips and routes occurs) ; add support for Mackie Control touch on/off messages

1 files changed, 18 insertions, 3 deletions

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index a7060dd433..efa98997b0 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -3275,10 +3275,25 @@ LineDrag::motion (GdkEvent* event, bool)
 }
 
 void
-LineDrag::finished (GdkEvent* event, bool)
+LineDrag::finished (GdkEvent* event, bool movement_occured)
 {
-	motion (event, false);
-	_line->end_drag (false, 0);
+	if (movement_occured) {
+		motion (event, false);
+		_line->end_drag (false, 0);
+	} else {
+		/* add a new control point on the line */
+
+		AutomationTimeAxisView* atv;
+
+		_line->end_drag (false, 0);
+
+		if ((atv = dynamic_cast<AutomationTimeAxisView*>(_editor->clicked_axisview)) != 0) {
+			framepos_t where = _editor->event_frame (event, 0, 0);
+			std::cerr << "Add new point @ " << where << ", " << _drags->current_pointer_y() << std::endl;
+			atv->add_automation_event (event, where, _drags->current_pointer_y(), false);
+		}
+	}
+
 	_editor->session()->commit_reversible_command ();
 }