add "shift" method used in 2.X and now a3 to move data starting at a position, not...

[ardour.git] / libs / evoral / evoral / ControlList.hpp

diff --git a/libs/evoral/evoral/ControlList.hpp b/libs/evoral/evoral/ControlList.hpp
index b4c8590cb65a7281536e74937a498d59bdddfd09..16d0400145b239d8fa87caa3615baafc6ddfefd1 100644 (file)
--- a/libs/evoral/evoral/ControlList.hpp
+++ b/libs/evoral/evoral/ControlList.hpp
@@ -24,6 +24,7 @@
 #include <boost/pool/pool.hpp>
 #include <boost/pool/pool_alloc.hpp>
 #include <glibmm/thread.h>
+#include "pbd/signals.h"
 #include "evoral/types.hpp"
 #include "evoral/Parameter.hpp"
 
@@ -94,8 +95,9 @@ public:
        ControlList& operator= (const ControlList&);
        bool operator== (const ControlList&);
 
-       void freeze();
-       void thaw ();
+       virtual void freeze();
+        virtual void thaw ();
+        bool frozen() const { return _frozen; }
 
        const Parameter& parameter() const                 { return _parameter; }
        void             set_parameter(const Parameter& p) { _parameter = p; }
@@ -111,27 +113,24 @@ public:
        void x_scale (double factor);
        bool extend_to (double);
        void slide (iterator before, double distance);
+        void shift (double before, double distance);
 
-       void reposition_for_rt_add (double when);
        void rt_add (double when, double value);
        void add (double when, double value);
        void fast_simple_add (double when, double value);
+        void merge_nascent (double when);
 
        void reset_range (double start, double end);
        void erase_range (double start, double end);
        void erase (iterator);
        void erase (iterator, iterator);
-       void move_ranges (std::list< RangeMove<double> > const &);
+       bool move_ranges (std::list< RangeMove<double> > const &);
        void modify (iterator, double, double);
 
        boost::shared_ptr<ControlList> cut (double, double);
        boost::shared_ptr<ControlList> copy (double, double);
        void clear (double, double);
 
-       boost::shared_ptr<ControlList> cut (iterator, iterator);
-       boost::shared_ptr<ControlList> copy (iterator, iterator);
-       void clear (iterator, iterator);
-
        bool paste (ControlList&, double position, float times);
 
        void set_yrange (double min, double max) {
@@ -191,12 +190,11 @@ public:
                std::pair<ControlList::const_iterator,ControlList::const_iterator> range;
        };
 
-       /** Lookup cache for point finding, range contains points between left and right */
+       /** Lookup cache for point finding, range contains points after left */
        struct SearchCache {
-               SearchCache() : left(-1), right(-1) {}
-               double left;  /* leftmost x coordinate used when finding "range" */
-               double right; /* rightmost x coordinate used when finding "range" */
-               std::pair<ControlList::const_iterator,ControlList::const_iterator> range;
+               SearchCache () : left(-1) {}
+               double left;  /* leftmost x coordinate used when finding "first" */
+               ControlList::const_iterator first;
        };
 
        const EventList& events() const { return _events; }
@@ -214,8 +212,10 @@ public:
         */
        double unlocked_eval (double x) const;
 
-       bool rt_safe_earliest_event (double start, double end, double& x, double& y, bool start_inclusive=false) const;
-       bool rt_safe_earliest_event_unlocked (double start, double end, double& x, double& y, bool start_inclusive=false) const;
+       bool rt_safe_earliest_event (double start, double& x, double& y, bool start_inclusive=false) const;
+       bool rt_safe_earliest_event_unlocked (double start, double& x, double& y, bool start_inclusive=false) const;
+       bool rt_safe_earliest_event_linear_unlocked (double start, double& x, double& y, bool inclusive) const;
+       bool rt_safe_earliest_event_discrete_unlocked (double start, double& x, double& y, bool inclusive) const;
 
        void create_curve();
        void destroy_curve();
@@ -223,7 +223,7 @@ public:
        Curve&       curve()       { assert(_curve); return *_curve; }
        const Curve& curve() const { assert(_curve); return *_curve; }
 
-       virtual void mark_dirty () const;
+       void mark_dirty () const;
 
        enum InterpolationStyle {
                Discrete,
@@ -232,17 +232,24 @@ public:
        };
 
        InterpolationStyle interpolation() const { return _interpolation; }
-       void set_interpolation(InterpolationStyle style) { _interpolation = style; }
-
+       void set_interpolation (InterpolationStyle);
+
+        virtual bool touching() const { return false; }
+        virtual bool writing() const { return false; }
+        virtual bool touch_enabled() const { return false; }
+        void write_pass_finished (double when);
+
+       /** Emitted when mark_dirty() is called on this object */
+       mutable PBD::Signal0<void> Dirty;
+       /** Emitted when our interpolation style changes */
+       PBD::Signal1<void, InterpolationStyle> InterpolationChanged;
+       
 protected:
 
        /** Called by unlocked_eval() to handle cases of 3 or more control points. */
        double multipoint_eval (double x) const;
 
-       void build_search_cache_if_necessary(double start, double end) const;
-
-       bool rt_safe_earliest_event_discrete_unlocked (double start, double end, double& x, double& y, bool inclusive) const;
-       bool rt_safe_earliest_event_linear_unlocked (double start, double end, double& x, double& y, bool inclusive) const;
+       void build_search_cache_if_necessary (double start) const;
 
        boost::shared_ptr<ControlList> cut_copy_clear (double, double, int op);
        bool erase_range_internal (double start, double end, EventList &);
@@ -251,25 +258,37 @@ protected:
 
        void _x_scale (double factor);
 
-       mutable LookupCache _lookup_cache;
-       mutable SearchCache _search_cache;
-
-       Parameter           _parameter;
-       InterpolationStyle  _interpolation;
-       EventList           _events;
-       mutable Glib::Mutex _lock;
-       int8_t              _frozen;
-       bool                _changed_when_thawed;
-       bool                _new_value;
-       double              _max_xval;
-       double              _min_yval;
-       double              _max_yval;
-       double              _default_value;
-       bool                _sort_pending;
-       iterator            _rt_insertion_point;
-       double              _rt_pos;
+       mutable LookupCache   _lookup_cache;
+       mutable SearchCache   _search_cache;
+
+       Parameter             _parameter;
+       InterpolationStyle    _interpolation;
+       EventList             _events;
+       mutable Glib::Mutex   _lock;
+       int8_t                _frozen;
+       bool                  _changed_when_thawed;
+       double                _max_xval;
+       double                _min_yval;
+       double                _max_yval;
+       double                _default_value;
+       bool                  _sort_pending;
 
        Curve* _curve;
+
+        struct NascentInfo {
+            EventList events;
+            bool   is_touch;
+            double start_time;
+            double end_time;
+            
+            NascentInfo (bool touching, double start = -1.0)
+                    : is_touch (touching)
+                    , start_time (start)
+                    , end_time (-1.0) 
+            {}
+        };
+    
+        std::list<NascentInfo*> nascent;
 };
 
 } // namespace Evoral