Some ToDo notes about AutomationTypes

[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 a57460c31bb5cde87831e34c2cff0c467617ed36..9810275ed14c15273b63b8f648d07f1b60bd27e8 100644 (file)
--- a/libs/ardour/ardour/automation_list.h
+++ b/libs/ardour/ardour/automation_list.h
@@ -40,6 +40,7 @@
 namespace ARDOUR {
 
 class AutomationList;
+class DoubleBeatsFramesConverter;
 
 /** A SharedStatefulProperty for AutomationLists */
 class LIBARDOUR_API AutomationListProperty : public PBD::SharedStatefulProperty<AutomationList>
@@ -65,9 +66,9 @@ private:
  * It includes session-specifics (such as automation state), control logic (e.g. touch, signals)
  * and acts as proxy to the underlying ControlList which holds the actual data.
  */
-class LIBARDOUR_API AutomationList : public PBD::StatefulDestructible, public Evoral::ControlList
+class LIBARDOUR_API AutomationList : public Evoral::ControlList, public PBD::StatefulDestructible
 {
-  public:
+public:
        AutomationList (const Evoral::Parameter& id, const Evoral::ParameterDescriptor& desc);
        AutomationList (const Evoral::Parameter& id);
        AutomationList (const XMLNode&, Evoral::Parameter id);
@@ -81,15 +82,12 @@ class LIBARDOUR_API AutomationList : public PBD::StatefulDestructible, public Ev
        AutomationList& operator= (const AutomationList&);
 
        void thaw ();
+       bool paste (const ControlList&, double, DoubleBeatsFramesConverter const&);
 
        void set_automation_state (AutoState);
        AutoState automation_state() const { return _state; }
        PBD::Signal1<void, AutoState> automation_state_changed;
 
-       void set_automation_style (AutoStyle m);
-       AutoStyle automation_style() const { return _style; }
-       PBD::Signal0<void> automation_style_changed;
-
        bool automation_playback() const {
                return (_state & Play) || ((_state & Touch) && !touching());
        }
@@ -106,7 +104,7 @@ class LIBARDOUR_API AutomationList : public PBD::StatefulDestructible, public Ev
 
        void start_touch (double when);
        void stop_touch (bool mark, double when);
-        bool touching() const { return g_atomic_int_get (const_cast<gint*>(&_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; }
 
@@ -121,14 +119,16 @@ class LIBARDOUR_API AutomationList : public PBD::StatefulDestructible, public Ev
 
        XMLNode* before () { XMLNode* rv = _before; _before = 0; return rv; }
        void clear_history ();
-  private:
+
+       ControlList::InterpolationStyle default_interpolation () const;
+
+private:
        void create_curve_if_necessary ();
        int deserialize_events (const XMLNode&);
 
        void maybe_signal_changed ();
 
        AutoState    _state;
-       AutoStyle    _style;
        gint         _touching;
 
        bool operator== (const AutomationList&) const { /* not called */ abort(); return false; }