X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_region_view.cc;h=2da15c17c5085e75017dbddafdfcc7856edc663f;hb=026c71331e87c1c4a1aaef6ad7ddc1cd0919c660;hp=0f62d3636cfd6746dcfcd67141cdcf2158a72b5d;hpb=f4b5f4c72ee60b6f509e307c5bfd164108d1f30b;p=ardour.git

diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index 0f62d3636c..2da15c17c5 100644
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -27,6 +27,8 @@
 #include "ardour/midi_region.h"
 #include "ardour/session.h"
 
+#include "gtkmm2ext/keyboard.h"
+
 #include "automation_region_view.h"
 #include "editing.h"
 #include "editor.h"
@@ -37,13 +39,13 @@
 
 #include "i18n.h"
 
-AutomationRegionView::AutomationRegionView (ArdourCanvas::Group*                      parent,
+AutomationRegionView::AutomationRegionView (ArdourCanvas::Container*                      parent,
 					    AutomationTimeAxisView&                   time_axis,
 					    boost::shared_ptr<ARDOUR::Region>         region,
 					    const Evoral::Parameter&                  param,
 					    boost::shared_ptr<ARDOUR::AutomationList> list,
 					    double                                    spu,
-					    Gdk::Color const &                        basic_color)
+					    uint32_t                                  basic_color)
 	: RegionView(parent, time_axis, region, spu, basic_color, true)
 	, _parameter(param)
 {
@@ -61,13 +63,11 @@ AutomationRegionView::~AutomationRegionView ()
 }
 
 void
-AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/)
+AutomationRegionView::init (bool /*wfd*/)
 {
 	_enable_display = false;
 
-	RegionView::init(basic_color, false);
-
-	compute_colors (basic_color);
+	RegionView::init (false);
 
 	reset_width_dependent_items ((double) _region->length() / samples_per_pixel);
 
@@ -120,7 +120,9 @@ AutomationRegionView::canvas_event (GdkEvent* ev)
 		y = std::max (y, 0.0);
 		y = std::min (y, _height - NAME_HIGHLIGHT_SIZE);
 
-		add_automation_event (ev, trackview.editor().pixel_to_sample (x) - _region->position() + _region->start(), y);
+		/* 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);
 	}
 
 	return false;
@@ -130,7 +132,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);
@@ -160,7 +162,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();