ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Use Controllist's time-domain for guard-point delta 

This fixes copy/paste of pan automation (amongst other things).
This commit is contained in:
Robin Gareus 2023-01-23 03:19:20 +01:00
parent efe943c98e
commit c24c210cce
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/evoral/ControlList.cc
View File

@ -33,7 +33,7 @@
#define isnan_local std::isnan
#endif
#define GUARD_POINT_DELTA(foo) (foo.time_domain () == Temporal::AudioTime ? Temporal::timecnt_t (64) : Temporal::timecnt_t (Beats (0, 1)))
#define GUARD_POINT_DELTA(foo) ((foo).time_domain () == Temporal::AudioTime ? Temporal::timecnt_t (64) : Temporal::timecnt_t (Beats (0, 1)))
#include <cassert>
#include <cmath>
@ -1945,8 +1945,8 @@ ControlList::paste (const ControlList& alist, timepos_t const& time)
/* when pasting a range of automation, first add guard points so the automation data before and after this range is retained */
const ControlEvent* last = alist.back ();
add_guard_point (time, -GUARD_POINT_DELTA (time));
add_guard_point (time + last->when, GUARD_POINT_DELTA (time));
add_guard_point (time, -GUARD_POINT_DELTA (*this));
add_guard_point (time + last->when, GUARD_POINT_DELTA (*this));
{
Glib::Threads::RWLock::WriterLock lm (_lock);