diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-22 20:21:43 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-22 20:21:43 +0000 |
| commit | c83389b8ec5fef9553a401e6123b7e55702af9e2 (patch) | |
| tree | 5580dd13b6275eefe67b9147ce96fa10db4d8674 /gtk2_ardour/imageframe_view.cc | |
| parent | 87fb46859c5950af7c00111afa81a00a1fad2196 (diff) | |
cleanup up cleanup at session destruction; clarify the meaning of 3 signals (DropReferences & Destroyed in libardour ; CatchDeletion in the GTK UI); clarify ownership of objects (session no longer pays attention to DropReferences for objects that it is considered to own, such as routes, sources, etc); fix up MIDI parsing and a couple of other places by correcting syntax for return of values from a boost::signals2::signal (possible danger elsewhere to be checked)
git-svn-id: svn://localhost/ardour2/branches/3.0@6389 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/imageframe_view.cc')
| -rw-r--r-- | gtk2_ardour/imageframe_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/imageframe_view.cc b/gtk2_ardour/imageframe_view.cc index 1d8f5ceab7..6feca44a85 100644 --- a/gtk2_ardour/imageframe_view.cc +++ b/gtk2_ardour/imageframe_view.cc @@ -111,7 +111,7 @@ ImageFrameView::ImageFrameView(const string & item_id, */ ImageFrameView::~ImageFrameView() { - GoingAway (this); + CatchDeletion (this); // destroy any marker items we have associated with this item @@ -287,7 +287,7 @@ ImageFrameView::add_marker_view_item(MarkerView* item, void* src) { marker_view_list.push_back(item) ; - item->GoingAway.connect (*this, boost::bind (&ImageFrameView::remove_marker_view_item, this, (void*)this), gui_context()); + item->CatchDeletion.connect (*this, boost::bind (&ImageFrameView::remove_marker_view_item, this, (void*)this), gui_context()); MarkerViewAdded(item, src) ; /* EMIT_SIGNAL */ } |