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

Fix crash when changing automation mode for MIDI track control automation.

Browse source 
Also some work towards tolerating automation controls with no automation list,
towards actually doing something for these cases, though not required just to
fix this crash (MidiTrack::set_parameter_automation_state() avoids those
paths).
This commit is contained in:
David Robillard 2014-08-31 18:52:37 -04:00 • committed by Paul Davis
parent 05afeb03f7
commit e35580f713
5 changed files with 45 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
libs/evoral/src/ControlSet.cpp
View file

@ -45,9 +45,12 @@ ControlSet::add_control(boost::shared_ptr<Control> ac)
ac->ListMarkedDirty.connect_same_thread (_control_connections, boost::bind (&ControlSet::control_list_marked_dirty, this));
ac->list()->InterpolationChanged.connect_same_thread (
_list_connections, boost::bind (&ControlSet::control_list_interpolation_changed, this, ac->parameter(), _1)
);
if (ac->list()) {
ac->list()->InterpolationChanged.connect_same_thread (
_list_connections,
boost::bind (&ControlSet::control_list_interpolation_changed,
this, ac->parameter(), _1));
}
}
void
@ -95,6 +98,9 @@ ControlSet::find_next_event (double now, double end, ControlEvent& next_event) c
ControlList::const_iterator i;
boost::shared_ptr<const ControlList> alist (li->second->list());
ControlEvent cp (now, 0.0f);
if (!alist) {
continue;
}
for (i = lower_bound (alist->begin(), alist->end(), &cp, ControlList::time_comparator);
i != alist->end() && (*i)->when < end; ++i) {
@ -121,8 +127,11 @@ ControlSet::clear_controls ()
_control_connections.drop_connections ();
_list_connections.drop_connections ();
for (Controls::iterator li = _controls.begin(); li != _controls.end(); ++li)
li->second->list()->clear();
for (Controls::iterator li = _controls.begin(); li != _controls.end(); ++li) {
if (li->second->list()) {
li->second->list()->clear();
}
}
}
} // namespace Evoral