diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-25 21:06:52 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-25 21:06:52 +0000 |
| commit | b6f4cdaea27fbf49f924b2684d4c638089314067 (patch) | |
| tree | 4328e93333d13eccadc18455ba32a7293d3cbd73 /gtk2_ardour/marker_time_axis_view.cc | |
| parent | f53cbaede885cd52b8fee59890e33575a4fc11fa (diff) | |
rationalize destruction pathway (some more); tidy-ify some ImageFrame code
git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker_time_axis_view.cc')
| -rw-r--r-- | gtk2_ardour/marker_time_axis_view.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk2_ardour/marker_time_axis_view.cc b/gtk2_ardour/marker_time_axis_view.cc index 3da442e89d..c4fa4bc4c8 100644 --- a/gtk2_ardour/marker_time_axis_view.cc +++ b/gtk2_ardour/marker_time_axis_view.cc @@ -67,6 +67,7 @@ MarkerTimeAxisView::MarkerTimeAxisView(MarkerTimeAxis& tv) _samples_per_unit = _trackview.editor.get_current_zoom() ; _trackview.editor.ZoomChanged.connect (sigc::mem_fun(*this, &MarkerTimeAxisView::reset_samples_per_unit)); + MarkerView::CatchDeletion.connect (*this, ui_bind (&MarkerTimeAxisView::remove_marker_view, this, _1), gui_context()); } /** @@ -211,8 +212,6 @@ MarkerTimeAxisView::add_marker_view(ImageFrameView* ifv, std::string mark_type, ifv->add_marker_view_item(mv, src) ; marker_view_list.push_front(mv) ; - mv->CatchDeletion.connect (*this, boost::bind (&MarkerTimeAxisView::remove_marker_view, this, _1), gui_context()); - MarkerViewAdded(mv,src) ; /* EMIT_SIGNAL */ return(mv) ; @@ -311,7 +310,7 @@ MarkerTimeAxisView::remove_named_marker_view(std::string item_id, void* src) * @param src the identity of the object that initiated the change */ void -MarkerTimeAxisView::remove_marker_view(MarkerView* mv) +MarkerTimeAxisView::remove_marker_view (MarkerView* mv) { ENSURE_GUI_THREAD (*this, &MarkerTimeAxisView::remove_marker_view, mv, src) @@ -326,7 +325,6 @@ MarkerTimeAxisView::remove_marker_view(MarkerView* mv) } } - /** * Sets the duration of the selected MarkerView to the specified number of seconds * |