13
0

manual fixups after a rebase against master

This commit is contained in:
Paul Davis 2021-02-12 10:49:26 -07:00
parent bbb3ca01fa
commit 4911779157
2 changed files with 3 additions and 3 deletions

View File

@ -1,4 +1,4 @@
n/*
/*
* Copyright (C) 2007-2015 David Robillard <d@drobilla.net>
* Copyright (C) 2008-2017 Paul Davis <paul@linuxaudiosystems.com>
* Copyright (C) 2009-2011 Carl Hetherington <carl@carlh.net>
@ -215,7 +215,7 @@ AutomationRegionView::add_automation_event (GdkEvent *, timepos_t const & w, dou
XMLNode& before = _line->the_list()->get_state();
n if (_line->the_list()->editor_add (when, y, with_guard_points)) {
if (_line->the_list()->editor_add (when, y, with_guard_points)) {
if (ac->automation_state () == ARDOUR::Off) {
ac->set_automation_state (ARDOUR::Play);

View File

@ -5468,7 +5468,7 @@ RubberbandSelectDrag::finished (GdkEvent* event, bool movement_occurred)
do_deselect = false;
}
} else if ((atv = dynamic_cast<AutomationTimeAxisView*>(_editor->clicked_axisview)) != 0) {
samplepos_t where = grab_sample ();
timepos_t where = grab_time ();
atv->add_automation_event (event, where, event->button.y, false);
do_deselect = false;
}