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

Start a new write-pass when writing automation and locating while rolling

Browse source
This commit is contained in:
Robin Gareus 2017-07-27 01:40:13 +02:00
parent 97e3168466
commit 3899c06fae
1 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libs/ardour/automatable.cc
View file

@ -340,6 +340,8 @@ Automatable::protect_automation ()
void void
Automatable::non_realtime_locate (framepos_t now) Automatable::non_realtime_locate (framepos_t now)
{ {
bool rolling = _a_session.transport_rolling ();
for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) { for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) {
boost::shared_ptr<AutomationControl> c boost::shared_ptr<AutomationControl> c
@ -348,8 +350,34 @@ Automatable::non_realtime_locate (framepos_t now)
boost::shared_ptr<AutomationList> l boost::shared_ptr<AutomationList> l
= boost::dynamic_pointer_cast<AutomationList>(c->list()); = boost::dynamic_pointer_cast<AutomationList>(c->list());
if (l) { if (!l) {
continue;
}
bool am_touching = c->touching ();
if (rolling && am_touching) {
/* when locating while rolling, and writing automation,
* start a new write pass.
* compare to compare to non_realtime_transport_stop()
*/
const bool list_did_write = !l->in_new_write_pass ();
c->stop_touch (-1); // time is irrelevant
l->stop_touch (-1);
c->commit_transaction (list_did_write);
l->write_pass_finished (now, Config->get_automation_thinning_factor ());
if (l->automation_state () == Write) {
l->set_automation_state (Touch);
}
if (l->automation_playback ()) {
c->set_value_unchecked (c->list ()->eval (now));
}
}
l->start_write_pass (now); l->start_write_pass (now);
if (rolling && am_touching) {
c->start_touch (now);
} }
} }
} }