From c83389b8ec5fef9553a401e6123b7e55702af9e2 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 22 Dec 2009 20:21:43 +0000 Subject: 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 --- gtk2_ardour/imageframe_time_axis_group.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour/imageframe_time_axis_group.cc') diff --git a/gtk2_ardour/imageframe_time_axis_group.cc b/gtk2_ardour/imageframe_time_axis_group.cc index a555d5254b..5cdbf2d3af 100644 --- a/gtk2_ardour/imageframe_time_axis_group.cc +++ b/gtk2_ardour/imageframe_time_axis_group.cc @@ -35,6 +35,8 @@ using namespace ARDOUR ; +PBD::Signal1 ImageFrameTimeAxisGroup::CatchDeletion; + //---------------------------------------------------------------------------------------// // Constructor / Desctructor @@ -74,7 +76,7 @@ ImageFrameTimeAxisGroup::~ImageFrameTimeAxisGroup() iter = next ; } - GoingAway ; /* EMIT_SIGNAL */ + CatchDeletion ; /* EMIT_SIGNAL */ } @@ -216,7 +218,7 @@ ImageFrameTimeAxisGroup::add_imageframe_item(const string & frame_id, nframes_t imageframe_views.push_front(ifv) ; - ifv->GoingAway.connect (*this, boost::bind (&ImageFrameTimeAxisGroup::remove_imageframe_item, this, (void*)this), gui_context()); + ifv->CatchDeletion.connect (*this, boost::bind (&ImageFrameTimeAxisGroup::remove_imageframe_item, this, (void*)this), gui_context()); ImageFrameAdded(ifv, src) ; /* EMIT_SIGNAL */ } -- cgit v1.2.3