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/marker.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour/marker.h') diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index 3802348567..05db900c80 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -24,9 +24,10 @@ #include #include +#include #include "ardour/ardour.h" -#include "pbd/destructible.h" +#include "pbd/signals.h" #include "canvas.h" @@ -37,7 +38,7 @@ namespace ARDOUR { class PublicEditor; -class Marker : public PBD::Destructible +class Marker : public sigc::trackable { public: enum Type { @@ -58,6 +59,8 @@ class Marker : public PBD::Destructible virtual ~Marker (); + static PBD::Signal1 CatchDeletion; + ArdourCanvas::Item& the_item() const; void add_line (ArdourCanvas::Group*, double y_origin, double initial_height); -- cgit v1.2.3