merge exportvis branch into cairocanvas, to reduce the number of "floating" branches.

[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 383c022bdb0d1cb478278d44f29fcb47ace3af61..0f62d3636cfd6746dcfcd67141cdcf2158a72b5d 100644 (file)
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -17,21 +17,23 @@
     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 "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"
 
@@ -50,10 +52,14 @@ AutomationRegionView::AutomationRegionView (ArdourCanvas::Group*
                create_line(list);
        }
 
-       group->signal_event().connect (sigc::mem_fun (this, &AutomationRegionView::canvas_event), false);
+       group->Event.connect (sigc::mem_fun (this, &AutomationRegionView::canvas_event));
        group->raise_to_top();
 }
 
+AutomationRegionView::~AutomationRegionView ()
+{
+}
+
 void
 AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/)
 {
@@ -63,7 +69,7 @@ AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/)
 
        compute_colors (basic_color);
 
-       reset_width_dependent_items ((double) _region->length() / samples_per_unit);
+       reset_width_dependent_items ((double) _region->length() / samples_per_pixel);
 
        set_height (trackview.current_height());
 
@@ -80,11 +86,10 @@ 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 ());
 }
@@ -97,25 +102,25 @@ 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) {
 
                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);
+               automation_view()->canvas_display()->canvas_to_item (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);
+
+               add_automation_event (ev, trackview.editor().pixel_to_sample (x) - _region->position() + _region->start(), y);
        }
 
        return false;
@@ -137,12 +142,16 @@ AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double
        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;
@@ -158,11 +167,11 @@ AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double
        /* 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 ();
 }
@@ -183,7 +192,7 @@ 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);
 }