summaryrefslogtreecommitdiff
path: root/gtk2_ardour/marker_view.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2005-11-15 04:47:01 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2005-11-15 04:47:01 +0000
commitadacfd9b24fb0ac7c4029cd659d21107eb7a2208 (patch)
tree784c5d1ef9fa7319db73485134b15ea0a4641d4b /gtk2_ardour/marker_view.cc
parentbeb3ee233969b7a1a7863102d0d38484f327dae3 (diff)
latest work
git-svn-id: svn://localhost/trunk/ardour2@98 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker_view.cc')
-rw-r--r--gtk2_ardour/marker_view.cc21
1 files changed, 7 insertions, 14 deletions
diff --git a/gtk2_ardour/marker_view.cc b/gtk2_ardour/marker_view.cc
index 193d81070b..f65c9431ca 100644
--- a/gtk2_ardour/marker_view.cc
+++ b/gtk2_ardour/marker_view.cc
@@ -64,21 +64,14 @@ MarkerView::MarkerView(Gnome::Canvas::Group *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 (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));
- /* 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) ;
}
/**