diff options
| author | Robin Gareus <robin@gareus.org> | 2017-06-14 02:38:32 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-06-14 02:40:09 +0200 |
| commit | 8b917c4c1660e4a22d187a676b9dfb562aa06ee2 (patch) | |
| tree | 3db34bbb13e94d841fdc091467d6bd2610df9e30 /libs/evoral/evoral/ControlList.hpp | |
| parent | 9c0f6ea9480cf22fefc17fdca93e3d5b1d5bebe3 (diff) | |
Add infrastructure to merge ControlLists
Diffstat (limited to 'libs/evoral/evoral/ControlList.hpp')
| -rw-r--r-- | libs/evoral/evoral/ControlList.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/evoral/evoral/ControlList.hpp b/libs/evoral/evoral/ControlList.hpp index 515067de04..109124162b 100644 --- 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); } |