X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpan_automation_time_axis.cc;h=b72eda78bd18bb3297ab51302e3df3daeb89f62c;hb=f535b0f4913a9c0b31ca3b21bd717c367676ebfc;hp=587a42f3e5b450201538bec2eee6ea4ac0b8d12c;hpb=e493b2b7c4fbbbfc457f02babf9546289b430177;p=ardour.git diff --git a/gtk2_ardour/pan_automation_time_axis.cc b/gtk2_ardour/pan_automation_time_axis.cc index 587a42f3e5..b72eda78bd 100644 --- a/gtk2_ardour/pan_automation_time_axis.cc +++ b/gtk2_ardour/pan_automation_time_axis.cc @@ -26,16 +26,18 @@ #include "pan_automation_time_axis.h" #include "automation_line.h" +#include "canvas_impl.h" #include "i18n.h" using namespace ARDOUR; +using namespace PBD; using namespace Gtk; -PanAutomationTimeAxisView::PanAutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& parent, Widget* p, std::string n) +PanAutomationTimeAxisView::PanAutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& parent, Canvas& canvas, std::string n) : AxisView (s), - AutomationTimeAxisView (s, r, e, parent, p, n, X_("pan"), "") + AutomationTimeAxisView (s, r, e, parent, canvas, n, X_("pan"), "") { } @@ -44,7 +46,7 @@ PanAutomationTimeAxisView::~PanAutomationTimeAxisView () } void -PanAutomationTimeAxisView::add_automation_event (GtkCanvasItem* item, GdkEvent* event, jack_nframes_t when, double y) +PanAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, jack_nframes_t when, double y) { if (lines.empty()) { /* no data, possibly caused by no outputs/inputs */ @@ -63,7 +65,7 @@ PanAutomationTimeAxisView::add_automation_event (GtkCanvasItem* item, GdkEvent* double x = 0; - gtk_canvas_item_w2i (canvas_display, &x, &y); + canvas_display->w2i (x, y); /* compute vertical fractional position */