reverse default behaviour for adding control points to automation with mouse clicks...
[ardour.git] / gtk2_ardour / automation_region_view.cc
index ca1e787f3a3fb2332244baca48f50c6303ce9023..409890e7b219efd9799e46d3dd640d8cdd532b82 100644 (file)
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2007 Paul Davis
-    Author: Dave Robillard
+    Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     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"
 
-AutomationRegionView::AutomationRegionView(ArdourCanvas::Group*                      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)
+AutomationRegionView::AutomationRegionView (ArdourCanvas::Group*                      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)
        : RegionView(parent, time_axis, region, spu, basic_color, true)
        , _parameter(param)
 {
@@ -54,6 +58,10 @@ AutomationRegionView::AutomationRegionView(ArdourCanvas::Group*
        group->raise_to_top();
 }
 
+AutomationRegionView::~AutomationRegionView ()
+{
+}
+
 void
 AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/)
 {
@@ -67,8 +75,6 @@ AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/)
 
        set_height (trackview.current_height());
 
-       _region->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RegionView::region_changed, this, _1), gui_context());
-
        set_colors ();
 
        _enable_display = true;
@@ -82,41 +88,45 @@ AutomationRegionView::create_line (boost::shared_ptr<ARDOUR::AutomationList> lis
                                trackview, *get_canvas_group(), list,
                                boost::dynamic_pointer_cast<ARDOUR::MidiRegion> (_region),
                                _parameter,
-                               &_time_converter));
+                               &_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 ());
 }
 
 bool
-AutomationRegionView::canvas_event(GdkEvent* ev)
+AutomationRegionView::canvas_event (GdkEvent* ev)
 {
        PublicEditor& e = trackview.editor ();
 
        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) {
 
                if (trackview.editor().drags()->active() && trackview.editor().drags()->end_grab (ev)) {
                        return true;
                }
-               
+
                double x = ev->button.x;
                double y = ev->button.y;
-               
+
                /* convert to item coordinates in the time axis view */
                automation_view()->canvas_display()->w2i (x, y);
 
                /* clamp y */
-               y = max (y, 0.0);
-               y = min (y, _height - NAME_HIGHLIGHT_SIZE);
-               
-               add_automation_event (ev, trackview.editor().pixel_to_frame (x) - _region->position(), y);
+               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, with_guard_points);
        }
 
        return false;
@@ -126,7 +136,7 @@ AutomationRegionView::canvas_event(GdkEvent* ev)
  *  @param y y position, relative to our TimeAxisView.
  */
 void
-AutomationRegionView::add_automation_event (GdkEvent *, nframes_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);
@@ -138,12 +148,16 @@ AutomationRegionView::add_automation_event (GdkEvent *, nframes_t when, double y
        assert(_line);
 
        AutomationTimeAxisView* const view = automation_view ();
-       
+
        /* compute vertical fractional position */
 
        const double h = trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2;
        y = 1.0 - (y / h);
 
+       /* snap frame */
+
+       when = snap_frame_to_frame (when - _region->start ()) + _region->start ();
+
        /* map using line */
 
        double when_d = when;
@@ -152,18 +166,18 @@ AutomationRegionView::add_automation_event (GdkEvent *, nframes_t when, double y
        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();
 
        /* XXX: hack! */
        boost::shared_ptr<ARDOUR::MidiRegion> mr = boost::dynamic_pointer_cast<ARDOUR::MidiRegion> (_region);
        assert (mr);
-       
+
        view->session()->commit_reversible_command (
                new MementoCommand<ARDOUR::AutomationList> (new ARDOUR::MidiAutomationListBinder (mr->midi_source(), _parameter), &before, &after)
                );
-       
+
 
        view->session()->set_dirty ();
 }
@@ -179,12 +193,12 @@ AutomationRegionView::set_height (double h)
 }
 
 bool
-AutomationRegionView::set_position (nframes64_t pos, void* src, double* ignored)
+AutomationRegionView::set_position (framepos_t pos, void* src, double* ignored)
 {
        if (_line) {
                _line->set_maximum_time (_region->length ());
        }
-       
+
        return RegionView::set_position(pos, src, ignored);
 }
 
@@ -203,10 +217,17 @@ AutomationRegionView::reset_width_dependent_items (double pixel_width)
 void
 AutomationRegionView::region_resized (const PBD::PropertyChange& what_changed)
 {
-       RegionView::region_resized(what_changed);
+       RegionView::region_resized (what_changed);
 
-       if (_line) {
-               _line->reset();
+       if (!_line) {
+               return;
+       }
+
+       if (what_changed.contains (ARDOUR::Properties::start)) {
+               _line->set_offset (_region->start ());
+       }
+
+       if (what_changed.contains (ARDOUR::Properties::length)) {
                _line->set_maximum_time (_region->length());
        }
 }
@@ -215,15 +236,16 @@ AutomationRegionView::region_resized (const PBD::PropertyChange& what_changed)
 void
 AutomationRegionView::entered (bool)
 {
-       if (_line)
+       if (_line) {
                _line->track_entered();
+       }
 }
 
 
 void
-AutomationRegionView::exited()
+AutomationRegionView::exited ()
 {
-       if (_line)
+       if (_line) {
                _line->track_exited();
+       }
 }
-