Add infrastructure to merge ControlLists

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

diff --git a/libs/evoral/evoral/ControlList.hpp b/libs/evoral/evoral/ControlList.hpp
index 515067de04a2698e57dd5113d83e083ee2230823..109124162b314ee3bf29b1c786cb15df9c92f0c9 100644 (file)
--- a/libs/evoral/evoral/ControlList.hpp
+++ b/libs/evoral/evoral/ControlList.hpp
@@ -124,6 +124,7 @@ public:
        void shift (double before, double distance);
 
        void y_transform (boost::function<double(double)> callback);
+       void list_merge (ControlList const& other, boost::function<double(double, double)> callback);
 
        /** add automation events
         * @param when absolute time in samples
@@ -217,7 +218,7 @@ public:
         * @param where absolute time in samples
         * @returns parameter value
         */
-       double eval (double where) {
+       double eval (double where) const {
                Glib::Threads::RWLock::ReaderLock lm (_lock);
                return unlocked_eval (where);
        }