diff options
| author | Robin Gareus <robin@gareus.org> | 2017-04-26 16:21:39 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-04-26 23:37:27 +0200 |
| commit | 0b5db91ee91afbd61a3ab11cb99796132f1b74b9 (patch) | |
| tree | 6771f6e96b0c5fe961c3117c90d52090006906f0 /libs/evoral | |
| parent | 8bb26628e392429c8a868af3d92cb79ee52a0fc7 (diff) | |
AutomationLine time-unit conversion and paste API update
This fixes copy/paste of MIDI automation (time-unit: beat) from/to
Parameter automation (time-unit: samples).
It also fixes repeatedly pasting with tempo-ramps: pre-multiply length
before converting to samples.
Diffstat (limited to 'libs/evoral')
| -rw-r--r-- | libs/evoral/evoral/ControlList.hpp | 2 | ||||
| -rw-r--r-- | libs/evoral/src/ControlList.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/evoral/evoral/ControlList.hpp b/libs/evoral/evoral/ControlList.hpp index 8e72c21c48..b58c186c21 100644 --- a/libs/evoral/evoral/ControlList.hpp +++ b/libs/evoral/evoral/ControlList.hpp @@ -172,7 +172,7 @@ public: */ void clear (double start, double end); - bool paste (const ControlList&, double position, float times); + bool paste (const ControlList&, double position); void set_yrange (double min, double max) { _min_yval = min; diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp index 0b2184a972..ce8ea89fc9 100644 --- a/libs/evoral/src/ControlList.cpp +++ b/libs/evoral/src/ControlList.cpp @@ -1652,7 +1652,7 @@ ControlList::clear (double start, double end) /** @param pos Position in model coordinates */ bool -ControlList::paste (const ControlList& alist, double pos, float /*times*/) +ControlList::paste (const ControlList& alist, double pos) { if (alist._events.empty()) { return false; |