diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-02-19 13:16:02 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-02-19 13:22:52 -0500 |
commit | efc3c8be42d4f55fe9b2f7104ee6c49207f58b2b (patch) | |
tree | f45246a705af6e11a9eccc5550e42356356f1d52 | |
parent | aa7a259fd369b506a7c39fd83309dad153823ed1 (diff) |
Revert "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"
This reverts commit 06a25ffd5695697db9869a19e46c2f93c6c17458.
-rw-r--r-- | gtk2_ardour/editor_drag.cc | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index efa98997b0..a7060dd433 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3275,25 +3275,10 @@ LineDrag::motion (GdkEvent* event, bool) } void -LineDrag::finished (GdkEvent* event, bool movement_occured) +LineDrag::finished (GdkEvent* event, bool) { - 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); - } - } - + motion (event, false); + _line->end_drag (false, 0); _editor->session()->commit_reversible_command (); } |