X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker_view.cc;h=d82554f891e919322276f87acf66715161977348;hb=fc26b49ac5e177857a155a567ff9f966f330e261;hp=4c9621878e9fe33051e1f7b2a6fe029c8fa3a98f;hpb=209d967b1bb80a9735d690d8f4f0455ecb9970ca;p=ardour.git

diff --git a/gtk2_ardour/marker_view.cc b/gtk2_ardour/marker_view.cc
index 4c9621878e..d82554f891 100644
--- a/gtk2_ardour/marker_view.cc
+++ b/gtk2_ardour/marker_view.cc
@@ -15,10 +15,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
-#include <gtk--.h>
+#include <gtkmm.h>
 
 #include "imageframe_time_axis.h"
 #include "imageframe_view.h"
@@ -27,9 +26,9 @@
 #include "marker_view.h"
 
 using namespace ARDOUR ;
-using namespace SigC;
+using namespace sigc;
 
-SigC::Signal1<void,MarkerView*> MarkerView::GoingAway;
+sigc::signal<void,MarkerView*> MarkerView::GoingAway;
 
 //---------------------------------------------------------------------------------------//
 // Constructor / Desctructor
@@ -47,16 +46,16 @@ SigC::Signal1<void,MarkerView*> MarkerView::GoingAway;
  * @param start the start time of this item
  * @param duration the duration of this item
  */
-MarkerView::MarkerView(GtkCanvasGroup *parent,
-	TimeAxisView* tv,
-	ImageFrameView* marked,
-	double spu,
-	GdkColor& basic_color,
-	std::string mark_type,
-	std::string mark_id,
-	jack_nframes_t start,
-	jack_nframes_t duration)
-  : TimeAxisViewItem(mark_id, parent,*tv,spu,basic_color,start,duration)
+MarkerView::MarkerView(ArdourCanvas::Group *parent,
+		       TimeAxisView* tv,
+		       ImageFrameView* marked,
+		       double spu,
+		       Gdk::Color& basic_color,
+		       std::string mark_type,
+		       std::string mark_id,
+		       nframes_t start,
+		       nframes_t duration)
+  : TimeAxisViewItem(mark_id, *parent,*tv,spu,basic_color,start,duration)
 {
 	mark_type_text = mark_type ;
 	marked_item = marked ;
@@ -64,21 +63,14 @@ MarkerView::MarkerView(GtkCanvasGroup *parent,
 	// set the canvas item text to the marker type, not the id
 	set_name_text(mark_type_text) ;
 
-	// hoo up our canvas events
-	gtk_signal_connect (GTK_OBJECT(frame_handle_start), "event",
-		(GtkSignalFunc) PublicEditor::canvas_markerview_start_handle_event,
-		this);
-	
-	gtk_signal_connect (GTK_OBJECT(frame_handle_end), "event",
-		(GtkSignalFunc) PublicEditor::canvas_markerview_end_handle_event,
-		this);
-		
-	gtk_signal_connect (GTK_OBJECT(group), "event",
-		(GtkSignalFunc) PublicEditor::canvas_markerview_item_view_event,	this);
+	// hook up our canvas events
+
+	frame_handle_start->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_start_handle_event), frame_handle_start, this));
+	frame_handle_end->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_end_handle_event), frame_handle_end, this));
+	group->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_item_view_event), group, this));
 	
-    /* handle any specific details required by the initial start end duration values */
-    set_position(start, this) ;
-    set_duration(duration, this) ;
+	set_position(start, this) ;
+	set_duration(duration, this) ;
 }
 
 /**