reverse default behaviour for adding control points to automation with mouse clicks...

[ardour.git] / gtk2_ardour / automation_region_view.cc

diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index fff86025d2ced132ec86b82fe6cdaefef55fc176..409890e7b219efd9799e46d3dd640d8cdd532b82 100644 (file)
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -17,21 +17,25 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <utility>
+
 #include "pbd/memento_command.h"
+
 #include "ardour/automation_control.h"
 #include "ardour/event_type_map.h"
-#include "ardour/session.h"
-#include "ardour/source.h"
 #include "ardour/midi_automation_list_binder.h"
 #include "ardour/midi_region.h"
+#include "ardour/session.h"
+
+#include "gtkmm2ext/keyboard.h"
 
 #include "automation_region_view.h"
+#include "editing.h"
+#include "editor.h"
+#include "editor_drag.h"
 #include "gui_thread.h"
-#include "public_editor.h"
 #include "midi_automation_line.h"
-#include "editor_drag.h"
-#include "editor.h"
-#include "editing.h"
+#include "public_editor.h"
 
 #include "i18n.h"
 
@@ -87,8 +91,7 @@ AutomationRegionView::create_line (boost::shared_ptr<ARDOUR::AutomationList> lis
                                &_source_relative_time_converter));
        _line->set_colors();
        _line->set_height ((uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE));
-       _line->show();
-       _line->show_all_control_points();
+       _line->set_visibility (AutomationLine::VisibleAspects (AutomationLine::Line|AutomationLine::ControlPoints));
        _line->set_maximum_time (_region->length());
        _line->set_offset (_region->start ());
 }
@@ -101,7 +104,7 @@ AutomationRegionView::canvas_event (GdkEvent* ev)
        if (ev->type == GDK_BUTTON_PRESS && e.current_mouse_mode() == Editing::MouseObject) {
 
                /* XXX: icky dcast to Editor */
-               e.drags()->set (new RubberbandSelectDrag (dynamic_cast<Editor*> (&e), group), ev);
+               e.drags()->set (new EditorRubberbandSelectDrag (dynamic_cast<Editor*> (&e), group), ev);
 
        } else if (ev->type == GDK_BUTTON_RELEASE) {
 
@@ -116,10 +119,14 @@ AutomationRegionView::canvas_event (GdkEvent* ev)
                automation_view()->canvas_display()->w2i (x, y);
 
                /* clamp y */
-               y = max (y, 0.0);
-               y = min (y, _height - NAME_HIGHLIGHT_SIZE);
+               y = std::max (y, 0.0);
+               y = std::min (y, _height - NAME_HIGHLIGHT_SIZE);
+
+               /* guard points only if primary modifier is used */
+
+               bool with_guard_points = Gtkmm2ext::Keyboard::modifier_state_equals (ev->button.state, Gtkmm2ext::Keyboard::PrimaryModifier);
 
-               add_automation_event (ev, trackview.editor().pixel_to_frame (x) - _region->position() + _region->start(), y);
+               add_automation_event (ev, trackview.editor().pixel_to_frame (x) - _region->position() + _region->start(), y, with_guard_points);
        }
 
        return false;
@@ -129,7 +136,7 @@ AutomationRegionView::canvas_event (GdkEvent* ev)
  *  @param y y position, relative to our TimeAxisView.
  */
 void
-AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double y)
+AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double y, bool with_guard_points)
 {
        if (!_line) {
                boost::shared_ptr<Evoral::Control> c = _region->control(_parameter, true);
@@ -159,7 +166,7 @@ AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double
        view->session()->begin_reversible_command (_("add automation event"));
        XMLNode& before = _line->the_list()->get_state();
 
-       _line->the_list()->add (when_d, y);
+       _line->the_list()->add (when_d, y, with_guard_points);
 
        XMLNode& after = _line->the_list()->get_state();