X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomatable.cc;h=6d8114939de2c3d8130aa5ae112575cdf4b9bd8c;hb=60872a8504cccc0d7e6c2485af8c0362577f5723;hp=d6379eb38e55fb3f349e04606769a55084101290;hpb=78986385e17b82a6704c8792fb21a42cd86add9a;p=ardour.git diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc index d6379eb38e..6d8114939d 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) @@ -72,22 +79,6 @@ Automatable::old_set_automation_state (const XMLNode& node) warning << _("Automation node has no path property") << endmsg; } - if ((prop = node.property ("visible")) != 0) { - uint32_t what; - stringstream sstr; - - _visible_controls.clear (); - - sstr << prop->value(); - while (1) { - sstr >> what; - if (sstr.fail()) { - break; - } - mark_automation_visible (Evoral::Parameter(PluginAutomation, 0, what), true); - } - } - _last_automation_snapshot = 0; return 0; @@ -98,7 +89,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(); @@ -149,7 +140,7 @@ Automatable::add_control(boost::shared_ptr ac) 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) ); @@ -160,17 +151,6 @@ Automatable::add_control(boost::shared_ptr ac) automation_list_automation_state_changed (param, al->automation_state ()); // sync everything up } -void -Automatable::what_has_visible_data(set& s) const -{ - Glib::Mutex::Lock lm (control_lock()); - set::const_iterator li; - - for (li = _visible_controls.begin(); li != _visible_controls.end(); ++li) { - s.insert (*li); - } -} - string Automatable::describe_parameter (Evoral::Parameter param) { @@ -178,12 +158,9 @@ 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("%1: %2 [%3]", - param.id() + 1, midi_name(param.id()), int(param.channel()) + 1); + param.id(), midi_name(param.id()), int(param.channel()) + 1); } else if (param.type() == MidiPgmChangeAutomation) { return string_compose("Program [%1]", int(param.channel()) + 1); } else if (param.type() == MidiPitchBenderAutomation) { @@ -201,33 +178,17 @@ Automatable::can_automate (Evoral::Parameter what) _can_automate_list.insert (what); } -void -Automatable::mark_automation_visible (Evoral::Parameter what, bool yn) -{ - if (yn) { - _visible_controls.insert (what); - } else { - set::iterator i; - - if ((i = _visible_controls.find (what)) != _visible_controls.end()) { - _visible_controls.erase (i); - } - } -} - /** \a legacy_param is used for loading legacy sessions where an object (IO, Panner) * had a single automation parameter, with it's type implicit. Derived objects should * 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()); /* Don't clear controls, since some may be special derived Controllable classes */ - _visible_controls.clear (); - XMLNodeList nlist = node.children(); XMLNodeIterator niter; @@ -249,26 +210,26 @@ 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; } } @@ -278,18 +239,17 @@ 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; } for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) { - boost::shared_ptr l - = boost::dynamic_pointer_cast(li->second->list()); + boost::shared_ptr l = boost::dynamic_pointer_cast(li->second->list()); if (!l->empty()) { node->add_child_nocopy (l->get_state ()); } @@ -360,11 +320,9 @@ void Automatable::protect_automation () { typedef set ParameterSet; - ParameterSet automated_params; + const ParameterSet& automated_params = what_can_be_automated (); - what_has_data(automated_params); - - for (ParameterSet::iterator i = automated_params.begin(); i != automated_params.end(); ++i) { + for (ParameterSet::const_iterator i = automated_params.begin(); i != automated_params.end(); ++i) { boost::shared_ptr c = control(*i); boost::shared_ptr l = boost::dynamic_pointer_cast(c->list()); @@ -383,14 +341,14 @@ 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()) { + if (_a_session.transport_rolling() && c->automation_write()) { c->list()->rt_add (now, i->second->user_double()); } } @@ -400,20 +358,35 @@ 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) { + /* Stop any active touch gesture just before we mark the write pass + as finished. If we don't do this, the transport can end up stopped with + an AutomationList thinking that a touch is still in progress and, + when the transport is re-started, a touch will magically + be happening without it ever have being started in the usual way. + */ + l->stop_touch (true, now); + 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); + } + } + } } } @@ -443,12 +416,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; } } @@ -478,3 +451,23 @@ 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 (); +}