X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Fautomation_list.cc;h=4b23378cacd1275e0d170fb660682ac177bca556;hp=db8f5bb799e4558019faace760ee791625160d77;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=8687895abba4209a6de8d8a8fc1bda5996f0d875 diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index db8f5bb799..4b23378cac 100644 --- a/libs/ardour/automation_list.cc +++ b/libs/ardour/automation_list.cc @@ -23,38 +23,53 @@ #include #include #include -#include #include "ardour/automation_list.h" #include "ardour/event_type_map.h" +#include "ardour/parameter_descriptor.h" #include "evoral/Curve.hpp" +#include "pbd/memento_command.h" #include "pbd/stacktrace.h" #include "pbd/enumwriter.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; using namespace PBD; -sigc::signal AutomationList::AutomationListCreated; +PBD::Signal1 AutomationList::AutomationListCreated; #if 0 static void dumpit (const AutomationList& al, string prefix = "") { cerr << prefix << &al << endl; - for (AutomationList::const_iterator i = al.const_begin(); i != al.const_end(); ++i) { + for (AutomationList::const_iterator i = al.begin(); i != al.end(); ++i) { cerr << prefix << '\t' << (*i)->when << ',' << (*i)->value << endl; } cerr << "\n"; } #endif +AutomationList::AutomationList (const Evoral::Parameter& id, const Evoral::ParameterDescriptor& desc) + : ControlList(id, desc) + , _before (0) +{ + _state = Off; + _style = Absolute; + g_atomic_int_set (&_touching, 0); -AutomationList::AutomationList (Evoral::Parameter id) - : ControlList(id) + create_curve_if_necessary(); + + assert(_parameter.type() != NullAutomation); + AutomationListCreated(this); +} + +AutomationList::AutomationList (const Evoral::Parameter& id) + : ControlList(id, ARDOUR::ParameterDescriptor(id)) + , _before (0) { _state = Off; _style = Absolute; - _touching = false; + g_atomic_int_set (&_touching, 0); create_curve_if_necessary(); @@ -65,10 +80,11 @@ AutomationList::AutomationList (Evoral::Parameter id) AutomationList::AutomationList (const AutomationList& other) : StatefulDestructible() , ControlList(other) + , _before (0) { _style = other._style; _state = other._state; - _touching = other._touching; + g_atomic_int_set (&_touching, other.touching()); create_curve_if_necessary(); @@ -78,10 +94,11 @@ AutomationList::AutomationList (const AutomationList& other) AutomationList::AutomationList (const AutomationList& other, double start, double end) : ControlList(other, start, end) + , _before (0) { _style = other._style; _state = other._state; - _touching = other._touching; + g_atomic_int_set (&_touching, other.touching()); create_curve_if_necessary(); @@ -89,13 +106,14 @@ AutomationList::AutomationList (const AutomationList& other, double start, doubl AutomationListCreated(this); } -/** \a id is used for legacy sessions where the type is not present - * in or below the node. It is used if \a id is non-null. +/** @param id is used for legacy sessions where the type is not present + * in or below the AutomationList node. It is used if @param id is non-null. */ AutomationList::AutomationList (const XMLNode& node, Evoral::Parameter id) - : ControlList(id) + : ControlList(id, ARDOUR::ParameterDescriptor(id)) + , _before (0) { - _touching = false; + g_atomic_int_set (&_touching, 0); _state = Off; _style = Absolute; @@ -113,13 +131,14 @@ AutomationList::AutomationList (const XMLNode& node, Evoral::Parameter id) AutomationList::~AutomationList() { - GoingAway (); + delete _before; } boost::shared_ptr -AutomationList::create(Evoral::Parameter id) +AutomationList::create(const Evoral::Parameter& id, + const Evoral::ParameterDescriptor& desc) { - return boost::shared_ptr(new AutomationList(id)); + return boost::shared_ptr(new AutomationList(id, desc)); } void @@ -127,7 +146,10 @@ AutomationList::create_curve_if_necessary() { switch (_parameter.type()) { case GainAutomation: - case PanAutomation: + case TrimAutomation: + case PanAzimuthAutomation: + case PanElevationAutomation: + case PanWidthAutomation: case FadeInAutomation: case FadeOutAutomation: case EnvelopeAutomation: @@ -138,27 +160,16 @@ AutomationList::create_curve_if_necessary() } } -bool -AutomationList::operator== (const AutomationList& other) -{ - return _events == other._events; -} - AutomationList& AutomationList::operator= (const AutomationList& other) { if (this != &other) { - _events.clear (); - for (const_iterator i = other._events.begin(); i != other._events.end(); ++i) { - _events.push_back (new Evoral::ControlEvent (**i)); - } - - _min_yval = other._min_yval; - _max_yval = other._max_yval; - _max_xval = other._max_xval; - _default_value = other._default_value; + ControlList::operator= (other); + _state = other._state; + _style = other._style; + _touching = other._touching; mark_dirty (); maybe_signal_changed (); @@ -172,7 +183,7 @@ AutomationList::maybe_signal_changed () { ControlList::maybe_signal_changed (); - if (!_frozen) { + if (!ControlList::frozen()) { StateChanged (); /* EMIT SIGNAL */ } } @@ -182,7 +193,13 @@ AutomationList::set_automation_state (AutoState s) { if (s != _state) { _state = s; - automation_state_changed (); /* EMIT SIGNAL */ + delete _before; + if (s == Write && _desc.toggled) { + _before = &get_state (); + } else { + _before = 0; + } + automation_state_changed (s); /* EMIT SIGNAL */ } } @@ -196,23 +213,66 @@ AutomationList::set_automation_style (AutoStyle s) } void -AutomationList::start_touch () +AutomationList::start_write_pass (double when) +{ + delete _before; + if (in_new_write_pass ()) { + _before = &get_state (); + } else { + _before = 0; + } + ControlList::start_write_pass (when); +} + +void +AutomationList::write_pass_finished (double when, double thinning_factor) +{ + ControlList::write_pass_finished (when, thinning_factor); +} + +void +AutomationList::start_touch (double when) { - _touching = true; - _new_value = true; + if (_state == Touch) { + start_write_pass (when); + } + + g_atomic_int_set (&_touching, 1); } void -AutomationList::stop_touch () +AutomationList::stop_touch (bool mark, double) { - _touching = false; - _new_value = false; + if (g_atomic_int_get (&_touching) == 0) { + /* this touch has already been stopped (probably by Automatable::transport_stopped), + so we've nothing to do. + */ + return; + } + + g_atomic_int_set (&_touching, 0); + + if (_state == Touch) { + + if (mark) { + + /* XXX need to mark the last added point with the + * current time + */ + } + } } +/* _before may be owned by the undo stack, + * so we have to be careful about doing this. + * + * ::before () transfers ownership, setting _before to 0 + */ void -AutomationList::freeze () +AutomationList::clear_history () { - _frozen++; + delete _before; + _before = 0; } void @@ -221,15 +281,15 @@ AutomationList::thaw () ControlList::thaw(); if (_changed_when_thawed) { + _changed_when_thawed = false; StateChanged(); /* EMIT SIGNAL */ } } -void -AutomationList::mark_dirty () const +Command* +AutomationList::memento_command (XMLNode* before, XMLNode* after) { - ControlList::mark_dirty (); - Dirty (); /* EMIT SIGNAL */ + return new MementoCommand (*this, before, after); } XMLNode& @@ -243,11 +303,11 @@ AutomationList::state (bool full) { XMLNode* root = new XMLNode (X_("AutomationList")); char buf[64]; - LocaleGuard lg (X_("POSIX")); + LocaleGuard lg; root->add_property ("automation-id", EventTypeMap::instance().to_symbol(_parameter)); - root->add_property ("id", _id.to_s()); + root->add_property ("id", id().to_s()); snprintf (buf, sizeof (buf), "%.12g", _default_value); root->add_property ("default", buf); @@ -255,13 +315,22 @@ AutomationList::state (bool full) root->add_property ("min-yval", buf); snprintf (buf, sizeof (buf), "%.12g", _max_yval); root->add_property ("max-yval", buf); - snprintf (buf, sizeof (buf), "%.12g", _max_xval); - root->add_property ("max-xval", buf); root->add_property ("interpolation-style", enum_2_string (_interpolation)); if (full) { - root->add_property ("state", auto_state_to_string (_state)); + /* never serialize state with Write enabled - too dangerous + for the user's data + */ + if (_state != Write) { + root->add_property ("state", auto_state_to_string (_state)); + } else { + if (_events.empty ()) { + root->add_property ("state", auto_state_to_string (Off)); + } else { + root->add_property ("state", auto_state_to_string (Touch)); + } + } } else { /* never save anything but Off for automation state to a template */ root->add_property ("state", auto_state_to_string (Off)); @@ -314,7 +383,7 @@ AutomationList::deserialize_events (const XMLNode& node) return -1; } - freeze (); + ControlList::freeze (); clear (); stringstream str (content_node->content()); @@ -341,11 +410,10 @@ AutomationList::deserialize_events (const XMLNode& node) error << _("automation list: cannot load coordinates from XML, all points ignored") << endmsg; } else { mark_dirty (); - reposition_for_rt_add (0); maybe_signal_changed (); } - thaw (); + thaw (); return 0; } @@ -353,10 +421,11 @@ AutomationList::deserialize_events (const XMLNode& node) int AutomationList::set_state (const XMLNode& node, int version) { + LocaleGuard lg; XMLNodeList nlist = node.children(); XMLNode* nsos; XMLNodeIterator niter; - const XMLProperty* prop; + XMLProperty const * prop; if (node.name() == X_("events")) { /* partial state setting*/ @@ -374,11 +443,11 @@ AutomationList::set_state (const XMLNode& node, int version) const XMLNodeList& elist = node.children(); XMLNodeConstIterator i; - XMLProperty* prop; - nframes_t x; + XMLProperty const * prop; + pframes_t x; double y; - freeze (); + ControlList::freeze (); clear (); for (i = elist.begin(); i != elist.end(); ++i) { @@ -408,16 +477,15 @@ AutomationList::set_state (const XMLNode& node, int version) return -1; } - if ((prop = node.property ("id")) != 0) { - _id = prop->value (); + if (set_id (node)) { /* update session AL list */ AutomationListCreated(this); } if ((prop = node.property (X_("automation-id"))) != 0){ - _parameter = EventTypeMap::instance().new_parameter(prop->value()); + _parameter = EventTypeMap::instance().from_symbol(prop->value()); } else { - warning << "Legacy session: automation list has no automation-id property."; + warning << "Legacy session: automation list has no automation-id property." << endmsg; } if ((prop = node.property (X_("interpolation-style"))) != 0) { @@ -440,34 +508,65 @@ AutomationList::set_state (const XMLNode& node, int version) if ((prop = node.property (X_("state"))) != 0) { _state = string_to_auto_state (prop->value()); + if (_state == Write) { + _state = Off; + } + automation_state_changed(_state); } else { _state = Off; } - if ((prop = node.property (X_("min_yval"))) != 0) { + if ((prop = node.property (X_("min-yval"))) != 0) { _min_yval = atof (prop->value ().c_str()); } else { _min_yval = FLT_MIN; } - if ((prop = node.property (X_("max_yval"))) != 0) { + if ((prop = node.property (X_("max-yval"))) != 0) { _max_yval = atof (prop->value ().c_str()); } else { _max_yval = FLT_MAX; } - if ((prop = node.property (X_("max_xval"))) != 0) { - _max_xval = atof (prop->value ().c_str()); - } else { - _max_xval = 0; // means "no limit ; - } + bool have_events = false; for (niter = nlist.begin(); niter != nlist.end(); ++niter) { if ((*niter)->name() == X_("events")) { deserialize_events (*(*niter)); + have_events = true; } } + if (!have_events) { + /* there was no Events child node; clear any current events */ + freeze (); + clear (); + mark_dirty (); + maybe_signal_changed (); + thaw (); + } + return 0; } +bool +AutomationList::operator!= (AutomationList const & other) const +{ + return ( + static_cast (*this) != static_cast (other) || + _state != other._state || + _style != other._style || + _touching != other._touching + ); +} + +PBD::PropertyBase * +AutomationListProperty::clone () const +{ + return new AutomationListProperty ( + this->property_id(), + boost::shared_ptr (new AutomationList (*this->_old.get())), + boost::shared_ptr (new AutomationList (*this->_current.get())) + ); +} +