Generic MIDI control now saves+restores its state; PBD::ID now requires a buffer size for its print() method

git-svn-id: svn://localhost/ardour2/trunk@949 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 7 insertions, 7 deletions

diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h
index c46e477b6e..ff8f8a9b52 100644
--- a/libs/pbd/pbd/controllable.h
+++ b/libs/pbd/pbd/controllable.h
@@ -1,6 +1,8 @@
 #ifndef __pbd_controllable_h__
 #define __pbd_controllable_h__
 
+#include <string>
+
 #include <sigc++/trackable.h>
 #include <sigc++/signal.h>
 
@@ -13,7 +15,7 @@ namespace PBD {
 
 class Controllable : public virtual sigc::trackable, public Stateful {
   public:
-	Controllable ();
+	Controllable (std::string name);
 	virtual ~Controllable() { GoingAway (this); }
 
 	virtual void set_value (float) = 0;
@@ -23,22 +25,20 @@ class Controllable : public virtual sigc::trackable, public Stateful {
 
 	sigc::signal<void> LearningFinished;
 
-	static sigc::signal<void,Controllable*> Created;
 	static sigc::signal<void,Controllable*> GoingAway;
 
-
 	static sigc::signal<bool,PBD::Controllable*> StartLearning;
 	static sigc::signal<void,PBD::Controllable*> StopLearning;
 
 	sigc::signal<void> Changed;
 
-	const PBD::ID& id() const { return _id; }
-
-	int set_state (const XMLNode&) { return 0; }
+	int set_state (const XMLNode&);
 	XMLNode& get_state ();
 
+	std::string name() const { return _name; }
+
   private:
-	PBD::ID _id;
+	std::string _name;
 };
 
 }