Fixed some valgrind errors from using uninitialized variables in

[ardour.git] / gtk2_ardour / gain_automation_time_axis.cc

diff --git a/gtk2_ardour/gain_automation_time_axis.cc b/gtk2_ardour/gain_automation_time_axis.cc
index 2f739e0fad2232a87642f6ed9d78adab791c046f..cb96774cdbbc81afa488ab0cfcc4bf2ee24d59d5 100644 (file)
--- a/gtk2_ardour/gain_automation_time_axis.cc
+++ b/gtk2_ardour/gain_automation_time_axis.cc
@@ -23,16 +23,17 @@
 
 #include "gain_automation_time_axis.h"
 #include "automation_line.h"
+#include "canvas.h"
 
 #include "i18n.h"
 
 using namespace ARDOUR;
 using namespace Gtk;
 
-GainAutomationTimeAxisView::GainAutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& parent, Widget* p, std::string n, ARDOUR::Curve& c)
+GainAutomationTimeAxisView::GainAutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& parent, ArdourCanvas::Canvas& canvas, const string & n, ARDOUR::Curve& c)
 
        : AxisView (s),
-         AutomationTimeAxisView (s, r, e, parent, p, n, X_("gain"), ""),
+         AutomationTimeAxisView (s, r, e, parent, canvas, n, X_("gain"), ""),
          curve (c)
        
 {
@@ -43,11 +44,11 @@ GainAutomationTimeAxisView::~GainAutomationTimeAxisView ()
 }
 
 void
-GainAutomationTimeAxisView::add_automation_event (GtkCanvasItem* item, GdkEvent* event, jack_nframes_t when, double y)
+GainAutomationTimeAxisView::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 */