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/ardour/automation_list.cc | |
| 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/ardour/automation_list.cc')
| -rw-r--r-- | libs/ardour/automation_list.cc | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index c397323767..0d43298610 100644 --- a/libs/ardour/automation_list.cc +++ b/libs/ardour/automation_list.cc @@ -24,8 +24,10 @@ #include <sstream> #include <algorithm> #include "ardour/automation_list.h" +#include "ardour/beats_frames_converter.h" #include "ardour/event_type_map.h" #include "ardour/parameter_descriptor.h" +#include "ardour/parameter_types.h" #include "ardour/evoral_types_convert.h" #include "ardour/types_convert.h" #include "evoral/Curve.hpp" @@ -289,6 +291,31 @@ AutomationList::thaw () } } +bool +AutomationList::paste (const ControlList& alist, double pos, DoubleBeatsFramesConverter const& bfc) +{ + AutomationType src_type = (AutomationType)alist.parameter().type(); + AutomationType dst_type = (AutomationType)_parameter.type(); + + if (parameter_is_midi (src_type) == parameter_is_midi (dst_type)) { + return ControlList::paste (alist, pos); + } + bool to_frame = parameter_is_midi (src_type); + + ControlList cl (alist); + cl.clear (); + for (const_iterator i = alist.begin ();i != alist.end (); ++i) { + double when = (*i)->when; + if (to_frame) { + when = bfc.to ((*i)->when); + } else { + when = bfc.from ((*i)->when); + } + cl.fast_simple_add (when, (*i)->value); + } + return ControlList::paste (cl, pos); +} + Command* AutomationList::memento_command (XMLNode* before, XMLNode* after) { |