X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_region_view.cc;h=5ad736d535f4c62f79f27797c5c7aeb38dc5f0f0;hb=4b5426eddefd742caa13f9539260ab97bc528a68;hp=200a1e2fb29e5841b64d2dd2a1057c6b5f3f9027;hpb=aaa91db6d9592684258267981e619b44cc2b7c40;p=ardour.git

diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index 200a1e2fb2..5ad736d535 100644
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -17,9 +17,11 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <pbd/memento_command.h>
-#include <ardour/session.h>
-#include <ardour/automation_control.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"
 
@@ -31,7 +33,7 @@ AutomationRegionView::AutomationRegionView(ArdourCanvas::Group*
                                            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)
 { 
@@ -44,7 +46,7 @@ AutomationRegionView::AutomationRegionView(ArdourCanvas::Group*
 }
 
 void
-AutomationRegionView::init (Gdk::Color& basic_color, bool wfd)
+AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/)
 {
 	_enable_display = false;
 	
@@ -68,7 +70,7 @@ AutomationRegionView::create_line (boost::shared_ptr<ARDOUR::AutomationList> lis
 {
 	_line = boost::shared_ptr<AutomationLine>(new AutomationLine(
 				ARDOUR::EventTypeMap::instance().to_symbol(list->parameter()),
-				trackview, *get_canvas_group(), list));
+				trackview, *get_canvas_group(), list, &_time_converter));
 	_line->set_colors();
 	_line->set_interpolation(list->interpolation());
 	_line->show();
@@ -90,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);
@@ -113,7 +115,7 @@ 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();
@@ -139,10 +141,7 @@ AutomationRegionView::set_height (double h)
 bool
 AutomationRegionView::set_position (nframes_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);
 }