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 969a0a216f782f6e54d371310731eae72cc9f6a1..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 <gtkmm.h>
-#include <libgnomecanvas/libgnomecanvas.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(Gnome::Canvas::Group *parent,
+                 MarkerView(ArdourCanvas::Group *parent,
                        TimeAxisView *tv,
                        ImageFrameView* marked,
                        double spu,
                        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