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)
{
{
switch (_parameter.type()) {
case GainAutomation:
- case PanAutomation:
+ case PanAzimuthAutomation:
+ case PanElevationAutomation:
+ case PanWidthAutomation:
case FadeInAutomation:
case FadeOutAutomation:
case EnvelopeAutomation:
}
}
-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 ();
{
if (s != _state) {
_state = s;
-
- if (_state == Write) {
- Glib::Mutex::Lock lm (ControlList::_lock);
- nascent.push_back (new NascentInfo (false));
- }
-
automation_state_changed (s); /* EMIT SIGNAL */
}
}
AutomationList::start_touch (double when)
{
if (_state == Touch) {
- Glib::Mutex::Lock lm (ControlList::_lock);
- nascent.push_back (new NascentInfo (true, when));
+ start_write_pass (when);
}
g_atomic_int_set (&_touching, 1);
}
void
-AutomationList::stop_touch (bool mark, double when)
+AutomationList::stop_touch (bool mark, double)
{
+ 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) {
- 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;
+
+ /* XXX need to mark the last added point with the
+ * current time
+ */
}
}
}
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);
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));
}
thaw ();
-
+
return 0;
}
int
AutomationList::set_state (const XMLNode& node, int version)
{
+ LocaleGuard lg (X_("POSIX"));
XMLNodeList nlist = node.children();
XMLNode* nsos;
XMLNodeIterator niter;
const XMLNodeList& elist = node.children();
XMLNodeConstIterator i;
XMLProperty* prop;
- nframes_t x;
+ pframes_t x;
double y;
ControlList::freeze ();
fast_simple_add (x, y);
}
- thaw ();
+ thaw ();
return 0;
}
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());
} 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) {
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));
return 0;
}
+bool
+AutomationList::operator!= (AutomationList const & other) const
+{
+ return (
+ static_cast<ControlList const &> (*this) != static_cast<ControlList const &> (other) ||
+ _state != other._state ||
+ _style != other._style ||
+ _touching != other._touching
+ );
+}
+
+PBD::PropertyBase *
+AutomationListProperty::clone () const
+{
+ return new AutomationListProperty (
+ this->property_id(),
+ boost::shared_ptr<AutomationList> (new AutomationList (*this->_old.get())),
+ boost::shared_ptr<AutomationList> (new AutomationList (*this->_current.get()))
+ );
+}
+
projects / ardour.git / blobdiff