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 /gtk2_ardour/automation_region_view.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 'gtk2_ardour/automation_region_view.cc')
| -rw-r--r-- | gtk2_ardour/automation_region_view.cc | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index e3e41b4428..ce1cd1498d 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -210,6 +210,8 @@ AutomationRegionView::paste (framepos_t pos float times, boost::shared_ptr<const ARDOUR::AutomationList> slist) { + using namespace ARDOUR; + AutomationTimeAxisView* const view = automation_view(); boost::shared_ptr<ARDOUR::AutomationList> my_list = _line->the_list(); @@ -218,15 +220,24 @@ AutomationRegionView::paste (framepos_t pos return false; } + AutomationType src_type = (AutomationType)slist->parameter().type (); + double len = slist->length(); + /* add multi-paste offset if applicable */ - pos += view->editor().get_paste_offset( - pos, paste_count, _source_relative_time_converter.to(slist->length())); + if (parameter_is_midi (src_type)) { + // convert length to samples (incl tempo-ramps) + len = DoubleBeatsFramesConverter (view->session()->tempo_map(), pos).to (len * paste_count); + pos += view->editor ().get_paste_offset (pos, paste_count > 0 ? 1 : 0, len); + } else { + pos += view->editor ().get_paste_offset (pos, paste_count, len); + } - const double model_pos = _source_relative_time_converter.from( + /* convert sample-position to model's unit and position */ + const double model_pos = _source_relative_time_converter.from ( pos - _source_relative_time_converter.origin_b()); XMLNode& before = my_list->get_state(); - my_list->paste(*slist, model_pos, times); + my_list->paste(*slist, model_pos, DoubleBeatsFramesConverter (view->session()->tempo_map(), pos)); view->session()->add_command( new MementoCommand<ARDOUR::AutomationList>(_line->memento_command_binder(), &before, &my_list->get_state())); |