NOOP, remove trailing tabs/whitespace.

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

diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h
index 58d1fe4acf92352634e6d36e76d284e66125b7a9..bc47f2fe0672d520996b8cb6cdb0e6ebb6d16646 100644 (file)
--- a/libs/ardour/ardour/automation_list.h
+++ b/libs/ardour/ardour/automation_list.h
@@ -21,34 +21,60 @@
 #define __ardour_automation_event_h__
 
 #include <stdint.h>
+#include <cstdlib>
 #include <list>
 #include <cmath>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
+
+#include "evoral/ControlList.hpp"
+#include "evoral/Parameter.hpp"
 
 #include "pbd/undo.h"
 #include "pbd/xml++.h"
 #include "pbd/statefuldestructible.h"
+#include "pbd/properties.h"
 
 #include "ardour/ardour.h"
 
-#include "evoral/ControlList.hpp"
-
 namespace ARDOUR {
 
-class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlList
+class AutomationList;
+
+/** A SharedStatefulProperty for AutomationLists */
+class LIBARDOUR_API AutomationListProperty : public PBD::SharedStatefulProperty<AutomationList>
+{
+public:
+       AutomationListProperty (PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > d, Ptr p)
+               : PBD::SharedStatefulProperty<AutomationList> (d.property_id, p)
+       {}
+
+       AutomationListProperty (PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > d, Ptr o, Ptr c)
+               : PBD::SharedStatefulProperty<AutomationList> (d.property_id, o, c)
+       {}
+
+       PBD::PropertyBase* clone () const;
+
+private:
+       /* No copy-construction nor assignment */
+       AutomationListProperty (AutomationListProperty const &);
+       AutomationListProperty& operator= (AutomationListProperty const &);
+};
+
+class LIBARDOUR_API AutomationList : public PBD::StatefulDestructible, public Evoral::ControlList
 {
   public:
-       AutomationList (Evoral::Parameter id);
+       AutomationList (const Evoral::Parameter& id, const Evoral::ParameterDescriptor& desc);
+       AutomationList (const Evoral::Parameter& id);
        AutomationList (const XMLNode&, Evoral::Parameter id);
        AutomationList (const AutomationList&);
        AutomationList (const AutomationList&, double start, double end);
        ~AutomationList();
 
-       virtual boost::shared_ptr<Evoral::ControlList> create(Evoral::Parameter id);
+       virtual boost::shared_ptr<ControlList> create(const Evoral::Parameter&           id,
+                                                     const Evoral::ParameterDescriptor& desc);
 
        AutomationList& operator= (const AutomationList&);
-       bool operator== (const AutomationList&);
 
        void thaw ();
 
@@ -73,7 +99,7 @@ class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlL
 
        void start_touch (double when);
        void stop_touch (bool mark, double when);
-       bool touching() const { return g_atomic_int_get (&_touching); }
+        bool touching() const { return g_atomic_int_get (const_cast<gint*>(&_touching)); }
        bool writing() const { return _state == Write; }
        bool touch_enabled() const { return _state == Touch; }
 
@@ -82,6 +108,8 @@ class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlL
        XMLNode& state (bool full);
        XMLNode& serialize_events ();
 
+       bool operator!= (const AutomationList &) const;
+
   private:
        void create_curve_if_necessary ();
        int deserialize_events (const XMLNode&);
@@ -91,6 +119,8 @@ class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlL
        AutoState    _state;
        AutoStyle    _style;
        gint         _touching;
+
+       bool operator== (const AutomationList&) const { /* not called */ abort(); return false; }
 };
 
 } // namespace