smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 19:56:31 +01:00
Code Issues Projects Releases Wiki Activity

Prepare for automation control master

Browse source 
Basic infrastructure to allow VCA automation and Trim automation:
look up events during automation playback.
This commit is contained in:
Robin Gareus 2017-05-30 15:13:37 +02:00
parent da021ef08f
commit 67f9f6fd75
3 changed files with 57 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/slavable_automation_control.h
View file

@ -64,6 +64,8 @@ class LIBARDOUR_API SlavableAutomationControl : public AutomationControl
int set_state (XMLNode const&, int); int set_state (XMLNode const&, int);
XMLNode& get_state(); XMLNode& get_state();
bool find_next_event (double now, double end, Evoral::ControlEvent& next_event) const;
protected: protected:
class MasterRecord { class MasterRecord {

7
libs/ardour/automatable.cc
View file

@ -563,6 +563,13 @@ Automatable::find_next_event (double now, double end, Evoral::ControlEvent& next
continue; continue;
} }
boost::shared_ptr<SlavableAutomationControl> sc
= boost::dynamic_pointer_cast<SlavableAutomationControl>(li->second);
if (sc) {
sc->find_next_event (now, end, next_event);
}
Evoral::ControlList::const_iterator i; Evoral::ControlList::const_iterator i;
boost::shared_ptr<const Evoral::ControlList> alist (li->second->list()); boost::shared_ptr<const Evoral::ControlList> alist (li->second->list());
Evoral::ControlEvent cp (now, 0.0f); Evoral::ControlEvent cp (now, 0.0f);

48
libs/ardour/slavable_automation_control.cc
View file

@ -344,6 +344,54 @@ SlavableAutomationControl::clear_masters ()
*/ */
} }
bool
SlavableAutomationControl::find_next_event (double now, double end, Evoral::ControlEvent& next_event) const
{
Glib::Threads::RWLock::ReaderLock lm (master_lock);
if (_masters.empty()) {
return false;
}
bool rv = false;
/* iterate over all masters check their automation lists
* for any event between "now" and "end" which is earlier than
* next_event.when. If found, set next_event.when and return true.
* (see also Automatable::find_next_event)
*/
for (Masters::const_iterator mr = _masters.begin(); mr != _masters.end(); ++mr) {
boost::shared_ptr<AutomationControl> ac (mr->second.master());
boost::shared_ptr<SlavableAutomationControl> sc
= boost::dynamic_pointer_cast<SlavableAutomationControl>(ac);
if (sc && sc->find_next_event (now, end, next_event)) {
rv = true;
}
Evoral::ControlList::const_iterator i;
boost::shared_ptr<const Evoral::ControlList> alist (ac->list());
Evoral::ControlEvent cp (now, 0.0f);
if (!alist) {
continue;
}
for (i = lower_bound (alist->begin(), alist->end(), &cp, Evoral::ControlList::time_comparator);
i != alist->end() && (*i)->when < end; ++i) {
if ((*i)->when > now) {
break;
}
}
if (i != alist->end() && (*i)->when < end) {
if ((*i)->when < next_event.when) {
next_event.when = (*i)->when;
rv = true;
}
}
}
return rv;
}
bool bool
SlavableAutomationControl::slaved_to (boost::shared_ptr<AutomationControl> m) const SlavableAutomationControl::slaved_to (boost::shared_ptr<AutomationControl> m) const
{ {