#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"
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();
{
_style = other._style;
_state = other._state;
- _touching = other._touching;
+ g_atomic_int_set (&_touching, other.touching());
create_curve_if_necessary();
{
_style = other._style;
_state = other._state;
- _touching = other._touching;
+ g_atomic_int_set (&_touching, other.touching());
create_curve_if_necessary();
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;
AutomationList::~AutomationList()
{
- GoingAway ();
}
boost::shared_ptr<Evoral::ControlList>
{
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));
return -1;
}
- freeze ();
+ ControlList::freeze ();
clear ();
stringstream str (content_node->content());
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;
}
nframes_t x;
double y;
- freeze ();
+ ControlList::freeze ();
clear ();
for (i = elist.begin(); i != elist.end(); ++i) {
fast_simple_add (x, y);
}
- thaw ();
+ thaw ();
return 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;
}