X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomation_list.cc;h=0810d2f2d007bb45c59eb8970d76e3048f6f5357;hb=dd577004459b7810daae2b4ad6741e3a2b858565;hp=f34104ce2228a29b1a17f9688434f23f793eeadc;hpb=d0d160e566c392f2ce100185ef547fdd623ce687;p=ardour.git diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index f34104ce22..0810d2f2d0 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: @@ -180,7 +181,12 @@ AutomationList::set_automation_state (AutoState s) { if (s != _state) { _state = s; - automation_state_changed (); /* EMIT SIGNAL */ + + if (_state == Write) { + Glib::Mutex::Lock lm (ControlList::_lock); + nascent.push_back (new NascentInfo ()); + } + automation_state_changed (s); /* EMIT SIGNAL */ } } @@ -194,17 +200,48 @@ AutomationList::set_automation_style (AutoStyle s) } void -AutomationList::start_touch () +AutomationList::start_touch (double when) { - _touching = true; - _new_value = true; + if (_state == Touch) { + Glib::Mutex::Lock lm (ControlList::_lock); + nascent.push_back (new NascentInfo (when)); + } + + g_atomic_int_set (&_touching, 1); } void -AutomationList::stop_touch () +AutomationList::stop_touch (bool mark, double when) { - _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) { + + assert (!nascent.empty ()); + + Glib::Mutex::Lock lm (ControlList::_lock); + + if (mark) { + + nascent.back()->end_time = when; + + } else { + + /* nascent info created in start touch but never used. just get rid of it. + */ + + NascentInfo* ninfo = nascent.back (); + nascent.erase (nascent.begin()); + delete ninfo; + } + } } void @@ -218,13 +255,6 @@ AutomationList::thaw () } } -void -AutomationList::mark_dirty () const -{ - ControlList::mark_dirty (); - Dirty (); /* EMIT SIGNAL */ -} - XMLNode& AutomationList::get_state () { @@ -240,7 +270,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); @@ -254,7 +284,14 @@ AutomationList::state (bool full) 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)); @@ -329,17 +366,18 @@ 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; } @@ -368,7 +406,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 (); @@ -391,6 +429,8 @@ AutomationList::set_state (const XMLNode& node, int version) fast_simple_add (x, y); } + thin (); + thaw (); return 0; @@ -401,8 +441,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); } @@ -433,34 +472,49 @@ 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; + } } 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) { + 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; }