and plain realloc (not mlocked) as baseline

[ardour.git] / libs / ardour / ardour / session_object.h

diff --git a/libs/ardour/ardour/session_object.h b/libs/ardour/ardour/session_object.h
index 07c33c97012df4de41646eedb9a70b2e53913776..ac74f07b7700c3522e13f7597abc620487fa25d2 100644 (file)
--- a/libs/ardour/ardour/session_object.h
+++ b/libs/ardour/ardour/session_object.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis
+    Copyright (C) 2000-2010 Paul Davis
 
     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
@@ -22,41 +22,49 @@
 
 #include <string>
 #include "pbd/statefuldestructible.h"
+#include "pbd/signals.h"
+#include "pbd/properties.h"
+
+#include "ardour/ardour.h"
+#include "ardour/session_handle.h"
 
 namespace ARDOUR {
 
+namespace Properties {
+       LIBARDOUR_API extern PBD::PropertyDescriptor<std::string> name;
+}
+
 class Session;
 
-/** An object associated with a Session.
- *
- * This is a few common things factored out of IO which weren't IO specific
- * (to fix the problem with e.g. PluginInsert being an IO which it shouldn't be).
- * collection of input and output ports with connections.
+/** A named object associated with a Session. Objects derived from this class are
+    expected to be destroyed before the session calls drop_references().
  */
-class SessionObject : public PBD::StatefulDestructible
+
+class LIBARDOUR_API SessionObject : public SessionHandleRef, public PBD::StatefulDestructible
 {
-public:
-       SessionObject(Session& session, const std::string& name)
-               : _session(session)
-               , _name(name)
-       {}
+  public:
+       static void make_property_quarks ();
 
-       Session&           session() const { return _session; }
-       const std::string& name()    const { return _name; }
+       SessionObject (Session& session, const std::string& name)
+               : SessionHandleRef (session)
+               , _name (Properties::name, name)
+       {
+               add_property (_name);
+       }
+
+       Session&    session() const { return _session; }
+       std::string name()    const { return _name; }
 
        virtual bool set_name (const std::string& str) {
                if (_name != str) {
                        _name = str;
-                       NameChanged();
+                       PropertyChanged (PBD::PropertyChange (Properties::name));
                }
                return true;
        }
 
-       sigc::signal<void> NameChanged;
-
-protected:
-       Session&    _session;
-       std::string _name;
+  protected:
+       PBD::Property<std::string> _name;
 };
 
 } // namespace ARDOUR