fix mute automation for busses & consolidate code.

[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 cf9ccbb3a7172476b6347c540765f95032da3e85..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
@@ -23,44 +23,48 @@
 #include <string>
 #include "pbd/statefuldestructible.h"
 #include "pbd/signals.h"
+#include "pbd/properties.h"
 
+#include "ardour/ardour.h"
 #include "ardour/session_handle.h"
 
-#include "i18n.h"
-
 namespace ARDOUR {
 
+namespace Properties {
+       LIBARDOUR_API extern PBD::PropertyDescriptor<std::string> name;
+}
+
 class Session;
 
 /** 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 SessionHandleRef, public PBD::StatefulDestructible
+class LIBARDOUR_API SessionObject : public SessionHandleRef, public PBD::StatefulDestructible
 {
   public:
+       static void make_property_quarks ();
+
        SessionObject (Session& session, const std::string& name)
                : SessionHandleRef (session)
-               , _name (X_("name"), PBD::Change (0), "")
+               , _name (Properties::name, name)
        {
-               add_state (_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;
        }
 
-       PBD::Signal0<void> NameChanged;
-
   protected:
-       PBD::State<std::string> _name;
+       PBD::Property<std::string> _name;
 };
 
 } // namespace ARDOUR