Create and make default the new rc file ardour2_ui.rc, with new font definitions

[ardour.git] / gtk2_ardour / redirect_automation_time_axis.cc

diff --git a/gtk2_ardour/redirect_automation_time_axis.cc b/gtk2_ardour/redirect_automation_time_axis.cc
index 5bbd7e290fe9cfb75fbe7b586bfe166f8376ccf5..798d132a4ae2d420d5ebf2dbdc407ec0cf4fb88d 100644 (file)
--- a/gtk2_ardour/redirect_automation_time_axis.cc
+++ b/gtk2_ardour/redirect_automation_time_axis.cc
@@ -24,17 +24,18 @@
 
 #include "redirect_automation_time_axis.h"
 #include "automation_line.h"
+#include "canvas_impl.h"
 
 #include "i18n.h"
 
 using namespace ARDOUR;
 using namespace Gtk;
 
-RedirectAutomationTimeAxisView::RedirectAutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& parent, Widget* p, std::string n,
+RedirectAutomationTimeAxisView::RedirectAutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& parent, Canvas& canvas, std::string n,
                                                                uint32_t prt, Redirect& rd, string state_name)
 
        : AxisView (s),
-         AutomationTimeAxisView (s, r, e, parent, p, n, state_name, rd.name()),
+         AutomationTimeAxisView (s, r, e, parent, canvas, n, state_name, rd.name()),
          redirect (rd),
          port (prt)
        
@@ -70,11 +71,11 @@ RedirectAutomationTimeAxisView::~RedirectAutomationTimeAxisView ()
 }
 
 void
-RedirectAutomationTimeAxisView::add_automation_event (GtkCanvasItem* item, GdkEvent* event, jack_nframes_t when, double y)
+RedirectAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, jack_nframes_t when, double y)
 {
        double x = 0;
 
-       gtk_canvas_item_w2i (canvas_display, &x, &y);
+       canvas_display->w2i (x, y);
 
        /* compute vertical fractional position */