Fixed some valgrind errors from using uninitialized variables in

[ardour.git] / gtk2_ardour / automation_time_axis.h

diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index d43be38a498710a99cf421994d09eed87639cea9..deb08b41f0a9c6c2d1c798de69e2da1733304e60 100644 (file)
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -6,6 +6,7 @@
 #include <string>
 #include <ardour/types.h>
 
+#include "canvas.h"
 #include "time_axis_view.h"
 #include "simplerect.h"
 
@@ -18,10 +19,6 @@ namespace ARDOUR {
        class Route;
 }
 
-namespace Gtk {
-       class Widget;
-}
-
 class PublicEditor;
 class TimeSelection;
 class AudioRegionSelection;
@@ -37,10 +34,10 @@ class AutomationTimeAxisView : public TimeAxisView {
                                ARDOUR::Route&,
                                PublicEditor&,
                                TimeAxisView& parent,
-                               Gtk::Widget* parent,
-                               std::string name, /* translatable */
-                               std::string state_name, /* not translatable */
-                               std::string plug_name = "");
+                               ArdourCanvas::Canvas& canvas,
+                               const string & name, /* translatable */
+                               const string & state_name, /* not translatable */
+                               const string & plug_name = "");
 
        ~AutomationTimeAxisView();
        
@@ -67,6 +64,7 @@ class AutomationTimeAxisView : public TimeAxisView {
        bool cut_copy_clear (Selection&, Editing::CutCopyOp);
        bool cut_copy_clear_objects (PointSelection&, Editing::CutCopyOp);
        bool paste (jack_nframes_t, float times, Selection&, size_t nth);
+       void reset_objects (PointSelection&);
 
        void add_ghost (GhostRegion*);
        void remove_ghost (GhostRegion*);
@@ -78,7 +76,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 
   protected:
        ARDOUR::Route& route;
-       Gnome::Canvas::SimpleRect* base_rect;
+       ArdourCanvas::SimpleRect* base_rect;
        string _name;
        string _state_name;
        bool    in_destructor;
@@ -108,6 +106,7 @@ class AutomationTimeAxisView : public TimeAxisView {
        bool cut_copy_clear_one (AutomationLine&, Selection&, Editing::CutCopyOp);
        bool cut_copy_clear_objects_one (AutomationLine&, PointSelection&, Editing::CutCopyOp);
        bool paste_one (AutomationLine&, jack_nframes_t, float times, Selection&, size_t nth);
+       void reset_objects_one (AutomationLine&, PointSelection&);
 
        virtual void set_automation_state (ARDOUR::AutoState) = 0;
        bool ignore_state_request;