X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker_view.h;h=38088b078a093478df419f51028d3dc9eb06b0a5;hb=11d041f6c021b70dd245fd41e9f167cb0f36c96e;hp=969a0a216f782f6e54d371310731eae72cc9f6a1;hpb=183f69970c6c436b102f8b2fbe1bc6070c9e9bfe;p=ardour.git

diff --git a/gtk2_ardour/marker_view.h b/gtk2_ardour/marker_view.h
index 969a0a216f..38088b078a 100644
--- a/gtk2_ardour/marker_view.h
+++ b/gtk2_ardour/marker_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003 Paul Davis 
+    Copyright (C) 2003 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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 ;
 
@@ -33,63 +36,63 @@ class ImageFrameView ;
  * MarkerView defines a marker item that may be placed upon a MarkerTimeAxis.
  *
  * The aim of the MarkerView is to provide additional timing details for visual based time axis.
- * The MarkerView item is associated with one other TimeAxisViewItem and has a start and a duration.  
+ * The MarkerView item is associated with one other TimeAxisViewItem and has a start and a duration.
  */
 class MarkerView : public TimeAxisViewItem
 {
 	public:
 		//---------------------------------------------------------------------------------------//
 		// Constructor / Desctructor
-		
+
 		/**
 		 * Constructs a new MarkerView
-		 * 
+		 *
 		 * @param parent the parent canvas item
 		 * @param tv the parent TimeAxisView of this item
 		 * @param marked the Item that this item is to be assciated (marking) with
-		 * @param spu the current samples per unit 
+		 * @param spu the current samples per unit
 		 * @param base_color
 		 * @param mark_type the marker type/name text, eg fade out, pan up etc.
 		 * @param mark_id unique name/id of this item
 		 * @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
 		 * Destroys this Marker Item and removes the association between itself and the item it is marking.
 		 */
 		~MarkerView() ;
-		
-		static sigc::signal<void,MarkerView*> GoingAway;
-		
+
+		static PBD::Signal1<void,MarkerView*> CatchDeletion;
+
 		//---------------------------------------------------------------------------------------//
 		// Marker Type Methods
-		
+
 		/**
-		 * Sets the marker Type text of this this MarkerItem, eg fade_out, pan up etc. 
+		 * Sets the marker Type text of this this MarkerItem, eg fade_out, pan up etc.
 		 *
 		 * @param type_text the marker type text of this item
 		 */
 		void set_mark_type_text(std::string type_text) ;
-		
+
 		/**
-		 * Returns the marker Type of this this MarkerItem, eg fade_out, pan up etc. 
+		 * Returns the marker Type of this this MarkerItem, eg fade_out, pan up etc.
 		 *
 		 * @return the marker type text of this item
 		 */
 		std::string get_mark_type_text() const ;
 
-		
+
 		//---------------------------------------------------------------------------------------//
 		// Marked Item Methods
 
@@ -99,7 +102,7 @@ class MarkerView : public TimeAxisViewItem
 		 * @return the time axis item being marked by this item
 		 */
 		ImageFrameView* get_marked_item() ;
-		
+
 		/**
 		 * Sets the time axis item being marker by this item
 		 *
@@ -107,17 +110,17 @@ class MarkerView : public TimeAxisViewItem
 		 * @return the previously marked item, or 0 if no previous marked item exists
 		 */
 		ImageFrameView* set_marked_item(ImageFrameView* item) ;
-		
+
 		//---------------------------------------------------------------------------------//
 		// Emitted Signals
-		
+
 		/** Emitted when the mark type text is changed */
 		sigc::signal<void,std::string,void*> MarkTypeChanged ;
-		
+
 		/** Emitted when the Marked Item is changed */
 		sigc::signal<void,ImageFrameView*,void*> MarkedItemChanged ;
 
-		
+
 	protected:
 
 	private:
@@ -126,7 +129,7 @@ class MarkerView : public TimeAxisViewItem
 
 		/* a pointer to the time axis item this marker is assoiated(marking up) with */
 		ImageFrameView* marked_item ;
-		
+
 } ; /* class MarkerView */