/*
- Copyright (C) 2002 Paul Davis
+ Copyright (C) 2002 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <cmath>
#include <sstream>
#include <algorithm>
-#include <sigc++/bind.h>
-#include <ardour/automation_list.h>
-#include <ardour/event_type_map.h>
-#include <evoral/Curve.hpp>
-#include <pbd/stacktrace.h>
-#include <pbd/enumwriter.h>
+#include "ardour/automation_list.h"
+#include "ardour/event_type_map.h"
+#include "evoral/Curve.hpp"
+#include "pbd/stacktrace.h"
+#include "pbd/enumwriter.h"
#include "i18n.h"
using namespace std;
using namespace ARDOUR;
-using namespace sigc;
using namespace PBD;
-sigc::signal<void,AutomationList *> AutomationList::AutomationListCreated;
+PBD::Signal1<void,AutomationList *> 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 (Evoral::Parameter id)
: ControlList(id)
{
_state = Off;
_style = Absolute;
- _touching = false;
+ g_atomic_int_set (&_touching, 0);
create_curve_if_necessary();
}
AutomationList::AutomationList (const AutomationList& other)
- : ControlList(other)
+ : StatefulDestructible()
+ , ControlList(other)
{
_style = other._style;
_state = other._state;
- _touching = other._touching;
-
+ g_atomic_int_set (&_touching, other.touching());
+
create_curve_if_necessary();
-
+
assert(_parameter.type() != NullAutomation);
AutomationListCreated(this);
}
{
_style = other._style;
_state = other._state;
- _touching = other._touching;
-
+ g_atomic_int_set (&_touching, other.touching());
+
create_curve_if_necessary();
assert(_parameter.type() != NullAutomation);
AutomationListCreated(this);
}
-/** \a id is used for legacy sessions where the type is not present
- * in or below the <AutomationList> 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)
{
- _touching = false;
+ g_atomic_int_set (&_touching, 0);
_state = Off;
_style = Absolute;
-
- set_state (node);
+
+ set_state (node, Stateful::loading_state_version);
if (id) {
_parameter = id;
}
-
+
create_curve_if_necessary();
assert(_parameter.type() != NullAutomation);
AutomationList::~AutomationList()
{
- GoingAway ();
}
boost::shared_ptr<Evoral::ControlList>
{
switch (_parameter.type()) {
case GainAutomation:
- case PanAutomation:
+ case PanAzimuthAutomation:
+ case PanElevationAutomation:
+ case PanWidthAutomation:
case FadeInAutomation:
case FadeOutAutomation:
case EnvelopeAutomation:
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;
-
+
mark_dirty ();
maybe_signal_changed ();
}
{
ControlList::maybe_signal_changed ();
- if (!_frozen) {
+ if (!ControlList::frozen()) {
StateChanged (); /* EMIT SIGNAL */
}
}
{
if (s != _state) {
_state = s;
- automation_state_changed (); /* EMIT SIGNAL */
+
+ if (_state == Write) {
+ Glib::Mutex::Lock lm (ControlList::_lock);
+ nascent.push_back (new NascentInfo (false));
+ }
+ automation_state_changed (s); /* EMIT SIGNAL */
}
}
}
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 (true, when));
+ }
-void
-AutomationList::stop_touch ()
-{
- _touching = false;
- _new_value = false;
+ g_atomic_int_set (&_touching, 1);
}
void
-AutomationList::freeze ()
+AutomationList::stop_touch (bool mark, double when)
{
- _frozen++;
+ 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;
+ }
+ }
}
void
ControlList::thaw();
if (_changed_when_thawed) {
+ _changed_when_thawed = false;
StateChanged(); /* EMIT SIGNAL */
}
}
-void
-AutomationList::mark_dirty () const
-{
- ControlList::mark_dirty ();
- Dirty (); /* EMIT SIGNAL */
-}
-
XMLNode&
AutomationList::get_state ()
{
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));
XMLNode* node = new XMLNode (X_("events"));
stringstream str;
+ str.precision(15); //10 digits is enough digits for 24 hours at 96kHz
+
for (iterator xx = _events.begin(); xx != _events.end(); ++xx) {
str << (double) (*xx)->when;
str << ' ';
return -1;
}
- freeze ();
+ ControlList::freeze ();
clear ();
-
+
stringstream str (content_node->content());
-
+
double x;
double y;
bool ok = true;
-
+
while (str) {
str >> x;
if (!str) {
}
fast_simple_add (x, y);
}
-
+
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 ();
+ thaw ();
return 0;
}
int
-AutomationList::set_state (const XMLNode& node)
+AutomationList::set_state (const XMLNode& node, int version)
{
XMLNodeList nlist = node.children();
XMLNode* nsos;
/* partial state setting*/
return deserialize_events (node);
}
-
+
if (node.name() == X_("Envelope") || node.name() == X_("FadeOut") || node.name() == X_("FadeIn")) {
if ((nsos = node.child (X_("AutomationList")))) {
/* new school in old school clothing */
- return set_state (*nsos);
+ return set_state (*nsos, version);
}
/* old school */
const XMLNodeList& elist = node.children();
XMLNodeConstIterator i;
XMLProperty* prop;
- nframes_t x;
+ pframes_t x;
double y;
-
- freeze ();
+
+ ControlList::freeze ();
clear ();
-
+
for (i = elist.begin(); i != elist.end(); ++i) {
-
+
if ((prop = (*i)->property ("x")) == 0) {
error << _("automation list: no x-coordinate stored for control point (point ignored)") << endmsg;
continue;
}
x = atoi (prop->value().c_str());
-
+
if ((prop = (*i)->property ("y")) == 0) {
error << _("automation list: no y-coordinate stored for control point (point ignored)") << endmsg;
continue;
}
y = atof (prop->value().c_str());
-
+
fast_simple_add (x, y);
}
-
- thaw ();
+
+ thaw ();
return 0;
}
/* update session AL list */
AutomationListCreated(this);
}
-
- if ((prop = node.property (X_("automation-id"))) != 0){
+
+ 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.";
}
-
+
if ((prop = node.property (X_("interpolation-style"))) != 0) {
_interpolation = (InterpolationStyle)string_2_enum(prop->value(), _interpolation);
} else {
_interpolation = Linear;
}
-
- if ((prop = node.property (X_("default"))) != 0){
+
+ if ((prop = node.property (X_("default"))) != 0){
_default_value = atof (prop->value().c_str());
} else {
_default_value = 0.0;
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;
}
projects / ardour.git / blobdiff