Fix update of the editor mixer when its route is removed; this stops routes (and...

[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 7b43f2f0af772884c8806cf87c0e4b8409c2c91d..0e88050edcb604765719a1357d4e350c4df7291f 100644 (file)
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2007 Paul Davis 
+    Copyright (C) 2007 Paul Davis
     Author: Dave Robillard
 
     This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,11 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <pbd/memento_command.h>
+#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 "automation_region_view.h"
 #include "public_editor.h"
 
@@ -26,26 +30,27 @@
 AutomationRegionView::AutomationRegionView(ArdourCanvas::Group*                      parent,
                                            AutomationTimeAxisView&                   time_axis,
                                            boost::shared_ptr<ARDOUR::Region>         region,
-                                           const ARDOUR::Parameter&                  param,
+                                           const Evoral::Parameter&                  param,
                                            boost::shared_ptr<ARDOUR::AutomationList> list,
                                            double                                    spu,
-                                           Gdk::Color&                               basic_color)
+                                           Gdk::Color const &                        basic_color)
        : RegionView(parent, time_axis, region, spu, basic_color)
        , _parameter(param)
-{ 
+{
        if (list) {
                assert(list->parameter() == param);
                create_line(list);
        }
-       
+
        group->signal_event().connect (mem_fun (this, &AutomationRegionView::canvas_event), false);
+       group->raise_to_top();
 }
 
 void
-AutomationRegionView::init (Gdk::Color& basic_color, bool wfd)
+AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/)
 {
        _enable_display = false;
-       
+
        RegionView::init(basic_color, false);
 
        compute_colors (basic_color);
@@ -65,20 +70,20 @@ void
 AutomationRegionView::create_line (boost::shared_ptr<ARDOUR::AutomationList> list)
 {
        _line = boost::shared_ptr<AutomationLine>(new AutomationLine(
-                               list->parameter().symbol(), trackview, *get_canvas_group(), list));
+                               ARDOUR::EventTypeMap::instance().to_symbol(list->parameter()),
+                               trackview, *get_canvas_group(), list, &_time_converter));
        _line->set_colors();
+       _line->set_interpolation(list->interpolation());
+       _line->set_height ((uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE));
        _line->show();
        _line->show_all_control_points();
-       _line->set_y_position_and_height (trackview.y_position,
-               (uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE));
 }
 
 bool
 AutomationRegionView::canvas_event(GdkEvent* ev)
 {
        if (ev->type == GDK_BUTTON_RELEASE) {
-
-               const nframes_t when = trackview.editor.pixel_to_frame((nframes_t)ev->button.x)
+               const nframes_t when = trackview.editor().pixel_to_frame((nframes_t)ev->button.x)
                        - _region->position();
                add_automation_event(ev, when, ev->button.y);
        }
@@ -87,7 +92,7 @@ AutomationRegionView::canvas_event(GdkEvent* ev)
 }
 
 void
-AutomationRegionView::add_automation_event (GdkEvent* event, nframes_t when, double y)
+AutomationRegionView::add_automation_event (GdkEvent* /*event*/, nframes_t when, double y)
 {
        if (!_line) {
                boost::shared_ptr<Evoral::Control> c = _region->control(_parameter, true);
@@ -98,10 +103,10 @@ AutomationRegionView::add_automation_event (GdkEvent* event, nframes_t when, dou
        }
        assert(_line);
 
-       double x = 0;
+       double x = when;
        AutomationTimeAxisView* const view = automation_view();
 
-       view->canvas_display->w2i (x, y);
+       view->canvas_display()->w2i (x, y);
 
        /* compute vertical fractional position */
 
@@ -110,12 +115,12 @@ AutomationRegionView::add_automation_event (GdkEvent* event, nframes_t when, dou
 
        /* map using line */
 
-       _line->view_to_model_y (y);
+       _line->view_to_model_coord (x, y);
 
        view->session().begin_reversible_command (_("add automation event"));
        XMLNode& before = _line->the_list()->get_state();
 
-       _line->the_list()->add (when, y);
+       _line->the_list()->add (x, y);
 
        XMLNode& after = _line->the_list()->get_state();
        view->session().commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(
@@ -124,33 +129,19 @@ AutomationRegionView::add_automation_event (GdkEvent* event, nframes_t when, dou
        view->session().set_dirty ();
 }
 
-void
-AutomationRegionView::set_y_position_and_height (double y, double h)
-{
-       cout << "ARV SET Y POSITION AND HEIGHT: " << y << ", " << h << endl;
-       RegionView::set_y_position_and_height(y, h - 1);
-
-       if (_line)
-               _line->set_y_position_and_height (y, h - NAME_HIGHLIGHT_SIZE);
-}
-
 void
 AutomationRegionView::set_height (double h)
 {
-       cout << "ARV SET HEIGHT: " << h << endl;
        RegionView::set_height(h);
+
        if (_line)
-               _line->set_y_position_and_height (trackview.y_position - h,
-                               (uint32_t)rint(h - NAME_HIGHLIGHT_SIZE));
+               _line->set_height ((uint32_t)rint(h - NAME_HIGHLIGHT_SIZE));
 }
 
 bool
-AutomationRegionView::set_position (nframes_t pos, void* src, double* ignored)
+AutomationRegionView::set_position (nframes64_t pos, void* src, double* ignored)
 {
-       // Do nothing, region parent will move us
-       //return false;
-       
-       return RegionView::set_position(pos, src, ignored); // FIXME: eventually...
+       return RegionView::set_position(pos, src, ignored);
 }
 
 
@@ -158,7 +149,7 @@ void
 AutomationRegionView::reset_width_dependent_items (double pixel_width)
 {
        RegionView::reset_width_dependent_items(pixel_width);
-       
+
        if (_line)
                _line->reset();
 }