cleanup up cleanup at session destruction; clarify the meaning of 3 signals (DropRefe...

[ardour.git] / libs / pbd / pbd / destructible.h

diff --git a/libs/pbd/pbd/destructible.h b/libs/pbd/pbd/destructible.h
index 7c5080633489dd7ce2050dc25d99d39aea2d4ea9..8881b45c55116d9f6523d06e6a997c68c780a6ac 100644 (file)
--- a/libs/pbd/pbd/destructible.h
+++ b/libs/pbd/pbd/destructible.h
@@ -1,26 +1,38 @@
-#ifndef __pbd_destructible_h__
-#define __pbd_destructible_h__
+/*
+    Copyright (C) 2000-2007 Paul Davis 
 
-#include <sigc++/signal.h>
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
-namespace PBD {
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-/* be very very careful using this class. it does not inherit from sigc::trackable and thus
-   should only be used in multiple-inheritance situations involving another type
-   that does inherit from sigc::trackable (or sigc::trackable itself)
 */
 
-class ThingWithGoingAway {
-  public:
-       virtual ~ThingWithGoingAway () {}
-       sigc::signal<void> GoingAway;
-};
+#ifndef __pbd_destructible_h__
+#define __pbd_destructible_h__
+
+#include "pbd/signals.h"
+
+namespace PBD {
 
-class Destructible : public sigc::trackable, public ThingWithGoingAway {
+class Destructible {
   public:
-       virtual ~Destructible () {}
-       void drop_references () const { GoingAway(); }
+        Destructible() {}
+       virtual ~Destructible () { Destroyed(); }
+       
+       PBD::Signal0<void> Destroyed;
+       PBD::Signal0<void> DropReferences;
 
+       void drop_references () { DropReferences();  }
 };
 
 }