smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-30 08:53:08 +01:00
Code Issues Projects Releases Wiki Activity

Fix adding MIDI automation points on an existing line #7683

Browse source 
This follows 973d58e8f9, which allows to ignore y-axis
position when drawing new events to parameter automation lanes.
This commit is contained in:
Robin Gareus 2020-10-04 22:18:54 +02:00
parent e76055d63d
commit 01b52ce221
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
gtk2_ardour/automation_region_view.cc
View file

@ -28,6 +28,7 @@
#include "ardour/event_type_map.h"
#include "ardour/midi_automation_list_binder.h"
#include "ardour/midi_region.h"
#include "ardour/midi_track.h"
#include "ardour/session.h"
#include "gtkmm2ext/keyboard.h"
@ -181,19 +182,29 @@ AutomationRegionView::add_automation_event (GdkEvent *, samplepos_t when, double
AutomationTimeAxisView* const view = automation_view ();
/* compute vertical fractional position */
y = 1.0 - (y / _line->height());
const double h = trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2;
y = 1.0 - (y / h);
/* snap sample, prepare conversion to double beats */
double when_d = snap_sample_to_sample (when - _region->start ()).sample + _region->start ();
/* snap sample */
when = snap_sample_to_sample (when - _region->start ()).sample + _region->start ();
/* map using line */
double when_d = when;
/* convert 'when' to music-time relative to the region and scale y from interface to internal */
_line->view_to_model_coord (when_d, y);
if (UIConfiguration::instance().get_new_automation_points_on_lane()) {
boost::shared_ptr<Evoral::Control> c = _region->control (_parameter, false);
assert (c);
if (c->list()->size () == 0) {
/* we need the MidiTrack::MidiControl, not the region's (midi model source) control */
boost::shared_ptr<ARDOUR::MidiTrack> mt = boost::dynamic_pointer_cast<ARDOUR::MidiTrack> (view->parent_stripable ());
assert (mt);
boost::shared_ptr<Evoral::Control> mc = mt->control(_parameter);
assert (mc);
y = mc->user_double ();
} else {
y = c->list()->eval (when_d);
}
}
XMLNode& before = _line->the_list()->get_state();
if (_line->the_list()->editor_add (when_d, y, with_guard_points)) {