X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomatable.cc;h=3230dac28f28fd40200765a6aad808c412f062b3;hb=84272b4e27e537bf2c38c9cd25675c61addea40a;hp=19678ec19c4a6cd94f8b9423cc6d76e4d7fe280d;hpb=24e92c1861e91835a62e38d76a516bfec915d43c;p=ardour.git diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc index 19678ec19c..3230dac28f 100644 --- a/libs/ardour/automatable.cc +++ b/libs/ardour/automatable.cc @@ -48,27 +48,40 @@ using namespace std; using namespace ARDOUR; using namespace PBD; +/* used for templates (previously: !full_state) */ +bool Automatable::skip_saving_automation = false; + const string Automatable::xml_node_name = X_("Automation"); Automatable::Automatable(Session& session) : _a_session(session) + , _automated_controls (new ControlList) { } Automatable::Automatable (const Automatable& other) - : ControlSet (other) - , _a_session (other._a_session) + : ControlSet (other) + , Slavable () + , _a_session (other._a_session) + , _automated_controls (new ControlList) { - Glib::Threads::Mutex::Lock lm (other._control_lock); + Glib::Threads::Mutex::Lock lm (other._control_lock); - for (Controls::const_iterator i = other._controls.begin(); i != other._controls.end(); ++i) { - boost::shared_ptr ac (control_factory (i->first)); + for (Controls::const_iterator i = other._controls.begin(); i != other._controls.end(); ++i) { + boost::shared_ptr ac (control_factory (i->first)); add_control (ac); - } + } } Automatable::~Automatable () { + { + RCUWriter writer (_automated_controls); + boost::shared_ptr cl = writer.get_copy (); + cl->clear (); + } + _automated_controls.flush (); + Glib::Threads::Mutex::Lock lm (_control_lock); for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) { boost::dynamic_pointer_cast(li->second)->drop_references (); @@ -135,7 +148,7 @@ Automatable::load_automation (const string& path) return 0; - bad: +bad: error << string_compose(_("cannot load automation data from %2"), fullpath) << endmsg; controls().clear (); ::fclose (in); @@ -236,24 +249,32 @@ Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter le continue; } - if (_can_automate_list.find (param) == _can_automate_list.end ()) { - warning << "Ignored automation data for non-automatable parameter" << endl; - continue; - } - if (!id_prop) { warning << "AutomationList node without automation-id property, " << "using default: " << EventTypeMap::instance().to_symbol(legacy_param) << endmsg; } + if (_can_automate_list.find (param) == _can_automate_list.end ()) { + boost::shared_ptr actl = automation_control (param); + if (actl && (*niter)->children().size() > 0 && Config->get_limit_n_automatables () > 0) { + actl->set_flags (Controllable::Flag ((int)actl->flags() & ~Controllable::NotAutomatable)); + can_automate (param); + info << "Marked parmater as automatable" << endl; + } else { + warning << "Ignored automation data for non-automatable parameter" << endl; + continue; + } + } + + boost::shared_ptr existing = automation_control (param); if (existing) { - existing->alist()->set_state (**niter, 3000); + existing->alist()->set_state (**niter, 3000); } else { - boost::shared_ptr newcontrol = control_factory(param); + boost::shared_ptr newcontrol = control_factory(param); add_control (newcontrol); - boost::shared_ptr al (new AutomationList(**niter, param)); + boost::shared_ptr al (new AutomationList(**niter, param)); newcontrol->set_list(al); } @@ -328,6 +349,8 @@ Automatable::protect_automation () case Write: l->set_automation_state (Off); break; + case Latch: + /* fall through */ case Touch: l->set_automation_state (Play); break; @@ -338,8 +361,10 @@ Automatable::protect_automation () } void -Automatable::non_realtime_locate (framepos_t now) +Automatable::non_realtime_locate (samplepos_t now) { + bool rolling = _a_session.transport_rolling (); + for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) { boost::shared_ptr c @@ -348,15 +373,41 @@ Automatable::non_realtime_locate (framepos_t now) boost::shared_ptr l = boost::dynamic_pointer_cast(c->list()); - if (l) { - l->start_write_pass (now); + 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); + + if (rolling && am_touching) { + c->start_touch (now); } } } } void -Automatable::non_realtime_transport_stop (framepos_t now, bool /*flush_processors*/) +Automatable::non_realtime_transport_stop (samplepos_t now, bool /*flush_processors*/) { for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) { boost::shared_ptr c = @@ -379,7 +430,8 @@ Automatable::non_realtime_transport_stop (framepos_t now, bool /*flush_processor */ const bool list_did_write = !l->in_new_write_pass (); - l->stop_touch (true, now); + c->stop_touch (now); + l->stop_touch (now); c->commit_transaction (list_did_write); @@ -396,8 +448,16 @@ Automatable::non_realtime_transport_stop (framepos_t now, bool /*flush_processor } void -Automatable::automation_run (framepos_t start, pframes_t nframes) +Automatable::automation_run (samplepos_t start, pframes_t nframes, bool only_active) { + if (only_active) { + boost::shared_ptr cl = _automated_controls.reader (); + for (ControlList::const_iterator ci = cl->begin(); ci != cl->end(); ++ci) { + (*ci)->automation_run (start, nframes); + } + return; + } + for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) { boost::shared_ptr c = boost::dynamic_pointer_cast(li->second); @@ -408,6 +468,35 @@ Automatable::automation_run (framepos_t start, pframes_t nframes) } } +void +Automatable::automation_list_automation_state_changed (Evoral::Parameter param, AutoState as) +{ + { + boost::shared_ptr c (automation_control(param)); + assert (c && c->list()); + + RCUWriter writer (_automated_controls); + boost::shared_ptr cl = writer.get_copy (); + + ControlList::iterator fi = std::find (cl->begin(), cl->end(), c); + if (fi != cl->end()) { + cl->erase (fi); + } + switch (as) { + /* all potential automation_playback() states */ + case Play: + case Touch: + case Latch: + cl->push_back (c); + break; + case Off: + case Write: + break; + } + } + _automated_controls.flush(); +} + boost::shared_ptr Automatable::control_factory(const Evoral::Parameter& param) { @@ -525,47 +614,55 @@ Automatable::clear_controls () } bool -Automatable::find_next_event (double now, 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 { - Controls::const_iterator li; - next_event.when = std::numeric_limits::max(); - for (li = _controls.begin(); li != _controls.end(); ++li) { - boost::shared_ptr c - = boost::dynamic_pointer_cast(li->second); - - if (only_active && (!c || !c->automation_playback())) { - continue; + if (only_active) { + boost::shared_ptr cl = _automated_controls.reader (); + for (ControlList::const_iterator ci = cl->begin(); ci != cl->end(); ++ci) { + if ((*ci)->automation_playback()) { + find_next_ac_event (*ci, start, end, next_event); + } + } + } else { + for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) { + boost::shared_ptr c + = boost::dynamic_pointer_cast(li->second); + if (c) { + find_next_ac_event (c, start, end, next_event); + } } + } + return next_event.when != std::numeric_limits::max(); +} - boost::shared_ptr sc - = boost::dynamic_pointer_cast(li->second); +void +Automatable::find_next_ac_event (boost::shared_ptr c, double start, double end, Evoral::ControlEvent& next_event) const +{ + boost::shared_ptr sc + = boost::dynamic_pointer_cast(c); - if (sc) { - sc->find_next_event (now, end, next_event); - } + if (sc) { + sc->find_next_event (start, end, next_event); + } - Evoral::ControlList::const_iterator i; - boost::shared_ptr alist (li->second->list()); - Evoral::ControlEvent cp (now, 0.0f); - if (!alist) { - continue; - } + Evoral::ControlList::const_iterator i; + boost::shared_ptr alist (c->list()); + Evoral::ControlEvent cp (start, 0.0f); + if (!alist) { + return; + } - 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; - } + for (i = lower_bound (alist->begin(), alist->end(), &cp, Evoral::ControlList::time_comparator); i != alist->end() && (*i)->when < end; ++i) { + if ((*i)->when > start) { + break; } + } - if (i != alist->end() && (*i)->when < end) { - if ((*i)->when < next_event.when) { - next_event.when = (*i)->when; - } + if (i != alist->end() && (*i)->when < end) { + if ((*i)->when < next_event.when) { + next_event.when = (*i)->when; } } - - return next_event.when != std::numeric_limits::max(); }