fixes for possible null engine dialog

[ardour.git] / gtk2_ardour / marker_view.h

diff --git a/gtk2_ardour/marker_view.h b/gtk2_ardour/marker_view.h
index fdd70ffb000e6a5106e2952ead87a41d1e1e4ce2..6c49a4dc0f606734340a89194bcaeedf0c17c0f2 100644 (file)
--- a/gtk2_ardour/marker_view.h
+++ b/gtk2_ardour/marker_view.h
@@ -15,17 +15,20 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __gtk_ardour_marker_view_h__
 #define __gtk_ardour_marker_view_h__
 
 #include <string>
-#include <gtk--.h>
-#include <gtk-canvas.h>
 #include "time_axis_view_item.h"
 
+#include "canvas.h"
+
+namespace Gdk {
+       class Color;
+}
+
 class MarkerTimeAxisView ;
 class ImageFrameView ;
 
@@ -54,15 +57,15 @@ class MarkerView : public TimeAxisViewItem
                 * @param start the start time of this item
                 * @param duration the duration of this item
                 */
-               MarkerView(GtkCanvasGroup *parent,
+                 MarkerView(ArdourCanvas::Group *parent,
                        TimeAxisView *tv,
                        ImageFrameView* marked,
                        double spu,
-                       GdkColor& base_color,
+                       Gdk::Color& base_color,
                        std::string mark_type,
                        std::string mark_id,
-                       jack_nframes_t start,
-                       jack_nframes_t duration) ;
+                       nframes_t start,
+                       nframes_t duration) ;
 
                /**
                 * Destructor
@@ -70,7 +73,7 @@ class MarkerView : public TimeAxisViewItem
                 */
                ~MarkerView() ;
                
-               static SigC::Signal1<void,MarkerView*> GoingAway;
+               static sigc::signal<void,MarkerView*> GoingAway;
                
                //---------------------------------------------------------------------------------------//
                // Marker Type Methods
@@ -112,10 +115,10 @@ class MarkerView : public TimeAxisViewItem
                // Emitted Signals
                
                /** Emitted when the mark type text is changed */
-               SigC::Signal2<void,std::string,void*> MarkTypeChanged ;
+               sigc::signal<void,std::string,void*> MarkTypeChanged ;
                
                /** Emitted when the Marked Item is changed */
-               SigC::Signal2<void,ImageFrameView*,void*> MarkedItemChanged ;
+               sigc::signal<void,ImageFrameView*,void*> MarkedItemChanged ;
 
                
        protected: