X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomation_list.cc;h=83df92488b02087b3adf6357992ffe57da0224de;hb=06cc5e5240cc2bfeb4e22c742a5705566bd11dbe;hp=2270b2eff72905c69fde4660a22a175acc2226ff;hpb=78986385e17b82a6704c8792fb21a42cd86add9a;p=ardour.git diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index 2270b2eff7..83df92488b 100644 --- a/libs/ardour/automation_list.cc +++ b/libs/ardour/automation_list.cc @@ -41,19 +41,18 @@ PBD::Signal1 AutomationList::AutomationListCreated; 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 (Evoral::Parameter id) : ControlList(id) { _state = Off; _style = Absolute; - _touching = false; + g_atomic_int_set (&_touching, 0); create_curve_if_necessary(); @@ -67,7 +66,7 @@ AutomationList::AutomationList (const AutomationList& other) { _style = other._style; _state = other._state; - _touching = other._touching; + g_atomic_int_set (&_touching, other.touching()); create_curve_if_necessary(); @@ -80,7 +79,7 @@ AutomationList::AutomationList (const AutomationList& other, double start, doubl { _style = other._style; _state = other._state; - _touching = other._touching; + g_atomic_int_set (&_touching, other.touching()); create_curve_if_necessary(); @@ -94,7 +93,7 @@ AutomationList::AutomationList (const AutomationList& other, double start, doubl AutomationList::AutomationList (const XMLNode& node, Evoral::Parameter id) : ControlList(id) { - _touching = false; + g_atomic_int_set (&_touching, 0); _state = Off; _style = Absolute; @@ -125,7 +124,9 @@ AutomationList::create_curve_if_necessary() { switch (_parameter.type()) { case GainAutomation: - case PanAutomation: + case PanAzimuthAutomation: + case PanElevationAutomation: + case PanWidthAutomation: case FadeInAutomation: case FadeOutAutomation: case EnvelopeAutomation: @@ -155,7 +156,6 @@ AutomationList::operator= (const AutomationList& other) _min_yval = other._min_yval; _max_yval = other._max_yval; - _max_xval = other._max_xval; _default_value = other._default_value; mark_dirty (); @@ -194,17 +194,36 @@ AutomationList::set_automation_style (AutoStyle s) } void -AutomationList::start_touch () +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 + */ + } + } } void @@ -233,7 +252,7 @@ AutomationList::state (bool full) 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); @@ -241,13 +260,18 @@ 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 { + root->add_property ("state", auto_state_to_string (Off)); + } } else { /* never save anything but Off for automation state to a template */ root->add_property ("state", auto_state_to_string (Off)); @@ -322,23 +346,25 @@ AutomationList::deserialize_events (const XMLNode& node) fast_simple_add (x, y); } + thin (); + if (!ok) { clear (); error << _("automation list: cannot load coordinates from XML, all points ignored") << endmsg; } else { mark_dirty (); - reposition_for_rt_add (0); maybe_signal_changed (); } thaw (); - + return 0; } int AutomationList::set_state (const XMLNode& node, int version) { + LocaleGuard lg (X_("POSIX")); XMLNodeList nlist = node.children(); XMLNode* nsos; XMLNodeIterator niter; @@ -361,7 +387,7 @@ AutomationList::set_state (const XMLNode& node, int version) const XMLNodeList& elist = node.children(); XMLNodeConstIterator i; XMLProperty* prop; - nframes_t x; + pframes_t x; double y; ControlList::freeze (); @@ -384,6 +410,8 @@ AutomationList::set_state (const XMLNode& node, int version) fast_simple_add (x, y); } + thin (); + thaw (); return 0; @@ -394,8 +422,7 @@ 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); } @@ -403,7 +430,7 @@ AutomationList::set_state (const XMLNode& node, int version) if ((prop = node.property (X_("automation-id"))) != 0){ _parameter = EventTypeMap::instance().new_parameter(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) { @@ -426,30 +453,28 @@ 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)); @@ -462,7 +487,6 @@ AutomationList::set_state (const XMLNode& node, int version) freeze (); clear (); mark_dirty (); - reposition_for_rt_add (0); maybe_signal_changed (); thaw (); } @@ -470,3 +494,24 @@ AutomationList::set_state (const XMLNode& node, int version) 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())) + ); +} +