diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-15 04:47:01 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-15 04:47:01 +0000 |
| commit | adacfd9b24fb0ac7c4029cd659d21107eb7a2208 (patch) | |
| tree | 784c5d1ef9fa7319db73485134b15ea0a4641d4b /gtk2_ardour/imageframe_view.cc | |
| parent | beb3ee233969b7a1a7863102d0d38484f327dae3 (diff) | |
latest work
git-svn-id: svn://localhost/trunk/ardour2@98 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/imageframe_view.cc')
| -rw-r--r-- | gtk2_ardour/imageframe_view.cc | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/gtk2_ardour/imageframe_view.cc b/gtk2_ardour/imageframe_view.cc index 4870c53849..865c286fde 100644 --- a/gtk2_ardour/imageframe_view.cc +++ b/gtk2_ardour/imageframe_view.cc @@ -93,28 +93,19 @@ ImageFrameView::ImageFrameView(std::string item_id, int im_width = (int)((double)(trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE) * im_ratio) ; imageframe = gnome_canvas_item_new(GNOME_CANVAS_GROUP(group), - gnome_canvas_imageframe_get_type(), - "pixbuf", pbuf, - "x", (gdouble) 1.0, - "y", (gdouble) 1.0, - "anchor", GTK_ANCHOR_NW, - "width", (gdouble) im_width, - "height", (gdouble) (trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE), - NULL) ; - - - gtk_signal_connect (GTK_OBJECT(frame_handle_start), "event", - (GtkSignalFunc) PublicEditor::canvas_imageframe_start_handle_event, - this); - - gtk_signal_connect (GTK_OBJECT(frame_handle_end), "event", - (GtkSignalFunc) PublicEditor::canvas_imageframe_end_handle_event, - this); - - gtk_signal_connect (GTK_OBJECT(group), "event", - (GtkSignalFunc) PublicEditor::canvas_imageframe_item_view_event, this); - - /* handle any specific details required by the initial start end duration values */ + gnome_canvas_imageframe_get_type(), + "pixbuf", pbuf, + "x", (gdouble) 1.0, + "y", (gdouble) 1.0, + "anchor", GTK_ANCHOR_NW, + "width", (gdouble) im_width, + "height", (gdouble) (trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE), + NULL) ; + + frame_handle_start->signal_event().connect() (bind (mem_fun (editor, &PublicEditor::canvas_imageframe_start_handle_event), frame_handle_start)); + frame_handle_end->signal_event().connect() (bind (mem_fun (editor, &PublicEditor::canvas_imageframe_end_handle_event), frame_handle_end)); + group->signal_event().connect() (bind (mem_fun (editor, &PublicEditor::canvas_imageframe_item_view_event, this);), group)); + frame_handle_start->raise_to_top(); frame_handle_end->raise_to_top(); |