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

Automation event lookup when rolling backwards

Browse source 
When rolling backwards we need to be able to find
the *next* event before "start".
This commit is contained in:
Robin Gareus 2019-11-18 15:06:59 +01:00
parent 81d8f0faa7
commit f49d11d5e3
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 42 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/ardour/ardour/automatable.h
View file

@ -129,6 +129,7 @@ protected:
private: private:
inline void find_next_ac_event (boost::shared_ptr<AutomationControl>, double start, double end, Evoral::ControlEvent& ev) const; inline void find_next_ac_event (boost::shared_ptr<AutomationControl>, double start, double end, Evoral::ControlEvent& ev) const;
inline void find_prev_ac_event (boost::shared_ptr<AutomationControl>, double start, double end, Evoral::ControlEvent& ev) const;
PBD::ScopedConnectionList _control_connections; ///< connections to our controls' signals PBD::ScopedConnectionList _control_connections; ///< connections to our controls' signals
}; };

45
libs/ardour/automatable.cc
View file

@ -620,13 +620,17 @@ Automatable::clear_controls ()
bool bool
Automatable::find_next_event (double start, double end, Evoral::ControlEvent& next_event, bool only_active) const Automatable::find_next_event (double start, double end, Evoral::ControlEvent& next_event, bool only_active) const
{ {
next_event.when = std::numeric_limits<double>::max(); next_event.when = start <= end ? std::numeric_limits<double>::max() : 0;
if (only_active) { if (only_active) {
boost::shared_ptr<ControlList> cl = _automated_controls.reader (); boost::shared_ptr<ControlList> cl = _automated_controls.reader ();
for (ControlList::const_iterator ci = cl->begin(); ci != cl->end(); ++ci) { for (ControlList::const_iterator ci = cl->begin(); ci != cl->end(); ++ci) {
if ((*ci)->automation_playback()) { if ((*ci)->automation_playback()) {
find_next_ac_event (*ci, start, end, next_event); if (start <= end) {
find_next_ac_event (*ci, start, end, next_event);
} else {
find_prev_ac_event (*ci, start, end, next_event);
}
} }
} }
} else { } else {
@ -634,16 +638,22 @@ Automatable::find_next_event (double start, double end, Evoral::ControlEvent& ne
boost::shared_ptr<AutomationControl> c boost::shared_ptr<AutomationControl> c
= boost::dynamic_pointer_cast<AutomationControl>(li->second); = boost::dynamic_pointer_cast<AutomationControl>(li->second);
if (c) { if (c) {
find_next_ac_event (c, start, end, next_event); if (start <= end) {
find_next_ac_event (c, start, end, next_event);
} else {
find_prev_ac_event (c, start, end, next_event);
}
} }
} }
} }
return next_event.when != std::numeric_limits<double>::max(); return next_event.when != (start <= end ? std::numeric_limits<double>::max() : 0);
} }
void void
Automatable::find_next_ac_event (boost::shared_ptr<AutomationControl> c, double start, double end, Evoral::ControlEvent& next_event) const Automatable::find_next_ac_event (boost::shared_ptr<AutomationControl> c, double start, double end, Evoral::ControlEvent& next_event) const
{ {
assert (start <= end);
boost::shared_ptr<SlavableAutomationControl> sc boost::shared_ptr<SlavableAutomationControl> sc
= boost::dynamic_pointer_cast<SlavableAutomationControl>(c); = boost::dynamic_pointer_cast<SlavableAutomationControl>(c);
@ -670,3 +680,30 @@ Automatable::find_next_ac_event (boost::shared_ptr<AutomationControl> c, double
} }
} }
} }
void
Automatable::find_prev_ac_event (boost::shared_ptr<AutomationControl> c, double start, double end, Evoral::ControlEvent& next_event) const
{
assert (start > end);
boost::shared_ptr<SlavableAutomationControl> sc
= boost::dynamic_pointer_cast<SlavableAutomationControl>(c);
if (sc) {
sc->find_next_event (start, end, next_event);
}
boost::shared_ptr<const Evoral::ControlList> alist (c->list());
if (!alist) {
return;
}
Evoral::ControlEvent cp (end, 0.0f);
Evoral::ControlList::const_iterator i = upper_bound (alist->begin(), alist->end(), &cp, Evoral::ControlList::time_comparator);
while (i != alist->end() && (*i)->when < start) {
if ((*i)->when > next_event.when) {
next_event.when = (*i)->when;
}
++i;
}
}