X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fautomatable.cc;h=20dc910f61d2af439e6bc8c2e693e8b6117d4dae;hb=f204206ff914200b132935d0fb1a8c84c2cf2284;hp=40b6eb2a07a04715c489f3bfe83383887d74db37;hpb=593b421180290f46f39efcb21ed8192b624bbc73;p=ardour.git diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc index 40b6eb2a07..20dc910f61 100644 --- a/libs/ardour/automatable.cc +++ b/libs/ardour/automatable.cc @@ -22,8 +22,12 @@ #include #include #include + +#include + #include "pbd/error.h" #include "pbd/enumwriter.h" +#include "pbd/stacktrace.h" #include "midi++/names.h" @@ -31,7 +35,9 @@ #include "ardour/amp.h" #include "ardour/event_type_map.h" #include "ardour/midi_track.h" +#include "ardour/pannable.h" #include "ardour/panner.h" +#include "ardour/pan_controllable.h" #include "ardour/plugin_insert.h" #include "ardour/session.h" @@ -41,7 +47,8 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -nframes_t Automatable::_automation_interval = 0; +framecnt_t Automatable::_automation_interval = 0; +const string Automatable::xml_node_name = X_("Automation"); Automatable::Automatable(Session& session) : _a_session(session) @@ -98,7 +105,7 @@ Automatable::load_automation (const string& path) { string fullpath; - if (path[0] == '/') { // legacy + if (Glib::path_is_absolute (path)) { // legacy fullpath = path; } else { fullpath = _a_session.automation_dir(); @@ -147,19 +154,17 @@ Automatable::add_control(boost::shared_ptr ac) { Evoral::Parameter param = ac->parameter(); - ControlSet::add_control(ac); - _can_automate_list.insert(param); - auto_state_changed(param); // sync everything up + boost::shared_ptr al = boost::dynamic_pointer_cast (ac->list ()); + assert (al); + + al->automation_state_changed.connect_same_thread ( + _list_connections, boost::bind (&Automatable::automation_list_automation_state_changed, this, ac->parameter(), _1) + ); - /* connect to automation_state_changed so that we can emit a signal when one of our controls' - automation state changes - */ - boost::shared_ptr c = boost::dynamic_pointer_cast (ac); - if (c) { - c->alist()->automation_state_changed.connect_same_thread ( - _control_connections, boost::bind (&Automatable::automation_state_changed, this, c->parameter()) - ); - } + ControlSet::add_control (ac); + _can_automate_list.insert (param); + + automation_list_automation_state_changed (param, al->automation_state ()); // sync everything up } void @@ -180,11 +185,8 @@ Automatable::describe_parameter (Evoral::Parameter param) if (param == Evoral::Parameter(GainAutomation)) { return _("Fader"); - } else if (param.type() == PanAutomation) { - /* ID's are zero-based, present them as 1-based */ - return (string_compose(_("Pan %1"), param.id() + 1)); } else if (param.type() == MidiCCAutomation) { - return string_compose("%2 [%3]", + return string_compose("%1: %2 [%3]", param.id() + 1, midi_name(param.id()), int(param.channel()) + 1); } else if (param.type() == MidiPgmChangeAutomation) { return string_compose("Program [%1]", int(param.channel()) + 1); @@ -222,7 +224,7 @@ Automatable::mark_automation_visible (Evoral::Parameter what, bool yn) * pass that type and it will be used for the untyped AutomationList found. */ int -Automatable::set_automation_state (const XMLNode& node, Evoral::Parameter legacy_param) +Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter legacy_param) { Glib::Mutex::Lock lm (control_lock()); @@ -251,26 +253,28 @@ Automatable::set_automation_state (const XMLNode& node, Evoral::Parameter legacy if (param.type() == NullAutomation) { warning << "Automation has null type" << endl; continue; - } + } - boost::shared_ptr al (new AutomationList(**niter, param)); + if (!id_prop) { warning << "AutomationList node without automation-id property, " << "using default: " << EventTypeMap::instance().to_symbol(legacy_param) << endmsg; } - boost::shared_ptr existing = control(param); + boost::shared_ptr existing = automation_control (param); + if (existing) { - existing->set_list(al); + existing->alist()->set_state (**niter, 3000); } else { - boost::shared_ptr newcontrol = control_factory(param); - add_control(newcontrol); + boost::shared_ptr newcontrol = control_factory(param); + add_control (newcontrol); + boost::shared_ptr al (new AutomationList(**niter, param)); newcontrol->set_list(al); } } else { - error << "Expected AutomationList node, got '" << (*niter)->name() << endmsg; + error << "Expected AutomationList node, got '" << (*niter)->name() << "'" << endmsg; } } @@ -280,10 +284,10 @@ Automatable::set_automation_state (const XMLNode& node, Evoral::Parameter legacy } XMLNode& -Automatable::get_automation_state () +Automatable::get_automation_xml_state () { Glib::Mutex::Lock lm (control_lock()); - XMLNode* node = new XMLNode (X_("Automation")); + XMLNode* node = new XMLNode (Automatable::xml_node_name); if (controls().empty()) { return *node; @@ -315,21 +319,16 @@ Automatable::set_parameter_automation_state (Evoral::Parameter param, AutoState } AutoState -Automatable::get_parameter_automation_state (Evoral::Parameter param, bool lock) +Automatable::get_parameter_automation_state (Evoral::Parameter param) { AutoState result = Off; - if (lock) - control_lock().lock(); - boost::shared_ptr c = control(param); boost::shared_ptr l = boost::dynamic_pointer_cast(c->list()); - if (c) + if (c) { result = l->automation_state(); - - if (lock) - control_lock().unlock(); + } return result; } @@ -390,15 +389,15 @@ Automatable::protect_automation () } void -Automatable::automation_snapshot (nframes_t now, bool force) +Automatable::automation_snapshot (framepos_t now, bool force) { if (force || _last_automation_snapshot > now || (now - _last_automation_snapshot) > _automation_interval) { for (Controls::iterator i = controls().begin(); i != controls().end(); ++i) { boost::shared_ptr c = boost::dynamic_pointer_cast(i->second); - if (c->automation_write()) { - c->list()->rt_add (now, i->second->user_float()); + if (_a_session.transport_rolling() && c->automation_write()) { + c->list()->rt_add (now, i->second->user_double()); } } @@ -407,20 +406,28 @@ Automatable::automation_snapshot (nframes_t now, bool force) } void -Automatable::transport_stopped (sframes_t now) +Automatable::transport_stopped (framepos_t now) { for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) { boost::shared_ptr c = boost::dynamic_pointer_cast(li->second); - boost::shared_ptr l + if (c) { + boost::shared_ptr l = boost::dynamic_pointer_cast(c->list()); - - c->list()->reposition_for_rt_add (now); - - if (c->automation_state() != Off) { - c->set_value(c->list()->eval(now)); - } + + if (l) { + l->write_pass_finished (now); + + if (l->automation_playback()) { + c->set_value(c->list()->eval(now)); + } + + if (l->automation_state() == Write) { + l->set_automation_state (Touch); + } + } + } } } @@ -450,12 +457,12 @@ Automatable::control_factory(const Evoral::Parameter& param) } else { warning << "GainAutomation for non-Amp" << endl; } - } else if (param.type() == PanAutomation) { - Panner* me = dynamic_cast(this); - if (me) { - control = new Panner::PanControllable(me->session(), X_("panner"), *me, param); + } else if (param.type() == PanAzimuthAutomation || param.type() == PanWidthAutomation || param.type() == PanElevationAutomation) { + Pannable* pannable = dynamic_cast(this); + if (pannable) { + control = new PanControllable (_a_session, pannable->describe_parameter (param), pannable, param); } else { - warning << "PanAutomation for non-Panner" << endl; + warning << "PanAutomation for non-Pannable" << endl; } } @@ -479,16 +486,29 @@ Automatable::automation_control (const Evoral::Parameter& id) const return boost::dynamic_pointer_cast(Evoral::ControlSet::control(id)); } -void -Automatable::automation_state_changed (Evoral::Parameter const & p) -{ - AutomationStateChanged (p); /* EMIT SIGNAL */ -} - void Automatable::clear_controls () { _control_connections.drop_connections (); ControlSet::clear_controls (); } - + +string +Automatable::value_as_string (boost::shared_ptr ac) const +{ + std::stringstream s; + + /* this is a the default fallback for this virtual method. Derived Automatables + are free to override this to display the values of their parameters/controls + in different ways. + */ + + // Hack to display CC as integer value, rather than double + if (ac->parameter().type() == MidiCCAutomation) { + s << lrint (ac->get_value()); + } else { + s << std::fixed << std::setprecision(3) << ac->get_value(); + } + + return s.str (); +}