Fixed some valgrind errors from using uninitialized variables in

[ardour.git] / gtk2_ardour / imageframe_time_axis.h

diff --git a/gtk2_ardour/imageframe_time_axis.h b/gtk2_ardour/imageframe_time_axis.h
index dfbb0bd72f4a070a02835fbabb2f7219c7c34737..cefd0c5d097f44333d42c716e4958e1b5a8a852d 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis.h
+++ b/gtk2_ardour/imageframe_time_axis.h
@@ -21,19 +21,23 @@
 #ifndef __ardour_imageframe_time_axis_h__
 #define __ardour_imageframe_time_axis_h__
 
-#include <gtk--.h>
-#include <gtk-canvas.h>
+#include <list>
+
+//#include <libgnomecanvas.h>
 
 #include "ardour_dialog.h"
 #include "enums.h"
 #include "time_axis_view.h"
-#include <list>
+#include "canvas.h"
 #include "visual_time_axis.h"
 
 namespace ARDOUR
 {
        class Session ;
 }
+namespace Gtk {
+       class Menu;
+}
 
 class PublicEditor ;
 class ImageFrameView ;
@@ -59,7 +63,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
                 * @param sess the current session
                 * @param canvas the parent canvas item
                 */
-               ImageFrameTimeAxis(std::string track_id, PublicEditor& ed, ARDOUR::Session& sess, Gtk::Widget *canvas) ;
+               ImageFrameTimeAxis(const string & track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
                
                /**
                 * Destructor
@@ -123,7 +127,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
                 * @param track_id the track_id of the MarkerTimeAxis to search for
                 * @return the named markerTimeAxis, or 0 if the named MarkerTimeAxis is not associated with this ImageFrameTimeAxis
                 */
-               MarkerTimeAxis* get_named_marker_time_axis(std::string track_id) ;
+               MarkerTimeAxis* get_named_marker_time_axis(const string & track_id) ;
                
                /**
                 * Removes the named markerTimeAxis from those associated with this ImageFrameTimeAxis
@@ -132,7 +136,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
                 * @param src the identity of the object that initiated the change
                 * @return the removed MarkerTimeAxis
                 */
-               MarkerTimeAxis* remove_named_marker_time_axis(std::string track_id, void* src) ;
+               MarkerTimeAxis* remove_named_marker_time_axis(const string & track_id, void* src) ;
                
                /**
                 * Removes tav from the list of MarkerTimaAxis associated with this ImageFrameTimeAxis
@@ -158,10 +162,10 @@ class ImageFrameTimeAxis : public VisualTimeAxis
                // Emitted Signals
                
                /** Emitted when a Marker Time Axis is Added, or associated with, this time axis */
-               SigC::Signal2<void,MarkerTimeAxis*,void*> MarkerTimeAxisAdded ;
+               sigc::signal<void,MarkerTimeAxis*,void*> MarkerTimeAxisAdded ;
                
                /** Emitted when a Marker Time Axis is removed, from this time axis */
-               SigC::Signal2<void,std::string,void*> MarkerTimeAxisRemoved ;
+               sigc::signal<void,std::string,void*> MarkerTimeAxisRemoved ;
                
        protected: