merge from trunk

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

diff --git a/libs/ardour/ardour/automation_event.h b/libs/ardour/ardour/automation_event.h
index 73aed389c1aa758e8d1e82aadde2b93d2f1f1928..dad94161d06744df181c3a18a7663efec0d26a27 100644 (file)
--- a/libs/ardour/ardour/automation_event.h
+++ b/libs/ardour/ardour/automation_event.h
@@ -154,10 +154,9 @@ class AutomationList : public StateManager, public Stateful
        virtual void load_state (const XMLNode&);
 
        XMLNode &get_state(void); 
-       int set_state (const XMLNode &s) { 
-           load_state(s); 
-           return 1; /*XXX*/ 
-       }
+       int set_state (const XMLNode &s);
+
+        PBD::ID id() { return _id; }
 
        void set_max_xval (double);
        double get_max_xval() const { return max_xval; }
@@ -184,7 +183,10 @@ class AutomationList : public StateManager, public Stateful
                }
        };
 
+        static sigc::signal<void, AutomationList*> AutomationListCreated;
+
   protected:
+        PBD::ID _id;
        struct State : public ARDOUR::StateManager::State {
            AutomationEventList events;