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

diff --git a/gtk2_ardour/marker_view.cc b/gtk2_ardour/marker_view.cc
index 8ccc3d8c12..d82554f891 100644
--- a/gtk2_ardour/marker_view.cc
+++ b/gtk2_ardour/marker_view.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <gtkmm.h>
@@ -48,14 +47,14 @@ sigc::signal<void,MarkerView*> MarkerView::GoingAway;
  * @param duration the duration of this item
  */
 MarkerView::MarkerView(ArdourCanvas::Group *parent,
-	TimeAxisView* tv,
-	ImageFrameView* marked,
-	double spu,
-       Gdk::Color& basic_color,
-	std::string mark_type,
-	std::string mark_id,
-	jack_nframes_t start,
-	jack_nframes_t duration)
+		       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 ;
@@ -66,9 +65,9 @@ MarkerView::MarkerView(ArdourCanvas::Group *parent,
 
 	// hook up our canvas events
 
-	frame_handle_start->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_markerview_start_handle_event), frame_handle_start, this));
-	frame_handle_end->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_markerview_end_handle_event), frame_handle_end, this));;
-	group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_markerview_item_view_event,	this), group, this));
+	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));
 	
 	set_position(start, this) ;
 	set_duration(duration, this) ;