Start autoscroll in from the right-hand edge of the screen if the editor list is...

[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 18ce6cc6461d7b15ccfbbd9f88b1f2ee995db951..ed1283e024d9cb12567246ef96fcdd213696a877 100644 (file)
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -17,21 +17,24 @@
     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 "ardour/source.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"
 
@@ -54,6 +57,10 @@ AutomationRegionView::AutomationRegionView (ArdourCanvas::Group*
        group->raise_to_top();
 }
 
+AutomationRegionView::~AutomationRegionView ()
+{
+}
+
 void
 AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/)
 {
@@ -80,7 +87,7 @@ 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();
@@ -97,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) {
 
@@ -112,10 +119,10 @@ 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);
 
-               add_automation_event (ev, trackview.editor().pixel_to_frame (x) - _region->position(), y);
+               add_automation_event (ev, trackview.editor().pixel_to_frame (x) - _region->position() + _region->start(), y);
        }
 
        return false;
@@ -143,6 +150,10 @@ AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double
        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;