From f5dbbe4ac6073e09a6a011eaeee95bf41f6e36f4 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 19 Feb 2014 12:54:00 -0500 Subject: [PATCH] ctrl-click when adding automation points no longer adds guard points --- gtk2_ardour/automation_region_view.cc | 5 ++--- gtk2_ardour/editor_mouse.cc | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index 9a96b4b0be..11f845f8a7 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -122,10 +122,9 @@ AutomationRegionView::canvas_event (GdkEvent* ev) y = std::max (y, 0.0); y = std::min (y, _height - NAME_HIGHLIGHT_SIZE); - /* no guard points if primary modifier is used */ - - bool with_guard_points = !Gtkmm2ext::Keyboard::modifier_state_equals (ev->button.state, Gtkmm2ext::Keyboard::PrimaryModifier); + /* no 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_sample (x) - _region->position() + _region->start(), y, with_guard_points); } diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index ca3fdd1369..1eef1bc121 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1682,7 +1682,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case AutomationTrackItem: atv = dynamic_cast(clicked_axisview); if (atv) { - bool with_guard_points = !Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier); + bool with_guard_points = Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier); atv->add_automation_event (event, where, event->button.y, with_guard_points); } return true; @@ -1702,7 +1702,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT */ AudioRegionView* arv = dynamic_cast (clicked_regionview); if (!were_dragging && arv) { - bool with_guard_points = !Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier); + bool with_guard_points = Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier); arv->add_gain_point_event (item, event, with_guard_points); } return true; @@ -1710,7 +1710,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT } case AutomationTrackItem: { - bool with_guard_points = !Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier); + bool with_guard_points = Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier); dynamic_cast(clicked_axisview)-> add_automation_event (event, where, event->button.y, with_guard_points); return true;