X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=gtk2_ardour%2Fmarker_view.cc;h=4bd842341bc76be7c0d8eaa8169617559ad105da;hb=c78528dcea03a61685ad0586eaa6302847af6fe9;hp=7700c8436f0e3fde21034be9d2a80bbd818dda75;hpb=64dc5427e4f5339a16a018692dd94f476c53cae9;p=ardour.git

diff --git a/gtk2_ardour/marker_view.cc b/gtk2_ardour/marker_view.cc
index 7700c8436f..4bd842341b 100644
--- a/gtk2_ardour/marker_view.cc
+++ b/gtk2_ardour/marker_view.cc
@@ -26,9 +26,8 @@
 #include "marker_view.h"
 
 using namespace ARDOUR ;
-using namespace sigc;
 
-sigc::signal<void,MarkerView*> MarkerView::GoingAway;
+PBD::Signal1<void,MarkerView*> MarkerView::CatchDeletion
 
 //---------------------------------------------------------------------------------------//
 // Constructor / Desctructor
@@ -53,8 +52,8 @@ MarkerView::MarkerView(ArdourCanvas::Group *parent,
 		       Gdk::Color& basic_color,
 		       std::string mark_type,
 		       std::string mark_id,
-		       nframes_t start,
-		       nframes_t duration)
+		       framepos_t start,
+		       framecnt_t duration)
   : TimeAxisViewItem(mark_id, *parent,*tv,spu,basic_color,start,duration)
 {
 	mark_type_text = mark_type ;
@@ -65,8 +64,10 @@ MarkerView::MarkerView(ArdourCanvas::Group *parent,
 
 	// hook up our canvas events
 
-	frame_handle_start->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_start_handle_event), frame_handle_start, this));
-	frame_handle_end->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_end_handle_event), frame_handle_end, this));
+	if (frame_handle_start) {
+		frame_handle_start->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_start_handle_event), frame_handle_start, this));
+		frame_handle_end->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_end_handle_event), frame_handle_end, this));
+	}
 	group->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_markerview_item_view_event), group, this));
 
 	set_position(start, this) ;