ardour/livetrax
13
0
Fork 0
Code

prevent addition of events to a ControlList whose time-domain does not match the ControlList's own time-domain

Browse Source
This commit is contained in:
Paul Davis 2021-08-30 15:15:14 -06:00
parent 4fb3e24bd6
commit 940f3022c1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/evoral/ControlList.cc
View File

@ -432,6 +432,7 @@ ControlList::fast_simple_add (timepos_t const & time, double value)
{
Glib::Threads::RWLock::WriterLock lm (_lock);
/* to be used only for loading pre-sorted data from saved state */
assert (time.time_domain() == _time_domain);
_events.insert (_events.end(), new ControlEvent (time, value));
mark_dirty ();
@ -532,6 +533,9 @@ ControlList::set_in_write_pass (bool yn, bool add_point, timepos_t when)
void
ControlList::add_guard_point (timepos_t const & time, timecnt_t const & offset)
{
assert (time.time_domain() == _time_domain);
assert (offset.time_domain() == _time_domain);
timepos_t when = time;
// caller needs to hold writer-lock
@ -749,6 +753,8 @@ ControlList::erase_from_iterator_to (iterator iter, timepos_t const & time)
void
ControlList::add (timepos_t const & time, double value, bool with_guards, bool with_initial)
{
assert (time.time_domain() == _time_domain);
timepos_t when = time;
/* clamp new value to allowed range */