#include <sstream>
#include <algorithm>
#include "ardour/automation_list.h"
-#include "ardour/beats_frames_converter.h"
+#include "ardour/beats_samples_converter.h"
#include "ardour/event_type_map.h"
#include "ardour/parameter_descriptor.h"
#include "ardour/parameter_types.h"
{
_state = Off;
g_atomic_int_set (&_touching, 0);
+ _interpolation = default_interpolation ();
create_curve_if_necessary();
{
_state = Off;
g_atomic_int_set (&_touching, 0);
+ _interpolation = default_interpolation ();
create_curve_if_necessary();
, _before (0)
{
g_atomic_int_set (&_touching, 0);
+ _interpolation = default_interpolation ();
_state = Off;
set_state (node, Stateful::loading_state_version);
default:
break;
}
+
+ WritePassStarted.connect_same_thread (_writepass_connection, boost::bind (&AutomationList::snapshot_history, this, false));
}
AutomationList&
AutomationList::operator= (const AutomationList& other)
{
if (this != &other) {
-
-
+ ControlList::freeze ();
+ /* ControlList::operator= calls copy_events() which calls
+ * mark_dirty() and maybe_signal_changed()
+ */
ControlList::operator= (other);
_state = other._state;
_touching = other._touching;
-
- mark_dirty ();
- maybe_signal_changed ();
+ ControlList::thaw ();
}
return *this;
}
}
+AutoState
+AutomationList::automation_state() const
+{
+ Glib::Threads::RWLock::ReaderLock lm (Evoral::ControlList::_lock);
+ return _state;
+}
+
void
AutomationList::set_automation_state (AutoState s)
{
- if (s != _state) {
+ {
+ Glib::Threads::RWLock::ReaderLock lm (Evoral::ControlList::_lock);
+
+ if (s == _state) {
+ return;
+ }
_state = s;
- delete _before;
if (s == Write && _desc.toggled) {
- _before = &get_state ();
- } else {
- _before = 0;
+ snapshot_history (true);
}
- automation_state_changed (s); /* EMIT SIGNAL */
}
+
+ automation_state_changed (s); /* EMIT SIGNAL */
+}
+
+Evoral::ControlList::InterpolationStyle
+AutomationList::default_interpolation () const
+{
+ switch (_parameter.type()) {
+ case GainAutomation:
+ case BusSendLevel:
+ case EnvelopeAutomation:
+ return ControlList::Exponential;
+ break;
+ case TrimAutomation:
+ return ControlList::Logarithmic;
+ break;
+ default:
+ break;
+ }
+ /* based on Evoral::ParameterDescriptor log,toggle,.. */
+ return ControlList::default_interpolation ();
}
void
AutomationList::start_write_pass (double when)
{
- delete _before;
- if (in_new_write_pass ()) {
- _before = &get_state ();
- } else {
- _before = 0;
- }
+ snapshot_history (true);
ControlList::start_write_pass (when);
}
void
AutomationList::start_touch (double when)
{
- if (_state == Touch) {
+ if (_state == Touch) {
start_write_pass (when);
- }
+ }
g_atomic_int_set (&_touching, 1);
}
void
-AutomationList::stop_touch (bool mark, double)
+AutomationList::stop_touch (double)
{
if (g_atomic_int_get (&_touching) == 0) {
/* this touch has already been stopped (probably by Automatable::transport_stopped),
}
g_atomic_int_set (&_touching, 0);
-
- if (_state == Touch) {
-
- if (mark) {
-
- /* XXX need to mark the last added point with the
- * current time
- */
- }
- }
}
/* _before may be owned by the undo stack,
_before = 0;
}
+void
+AutomationList::snapshot_history (bool need_lock)
+{
+ if (!in_new_write_pass ()) {
+ return;
+ }
+ delete _before;
+ _before = &state (true, need_lock);
+}
+
+
void
AutomationList::thaw ()
{
}
bool
-AutomationList::paste (const ControlList& alist, double pos, DoubleBeatsFramesConverter const& bfc)
+AutomationList::paste (const ControlList& alist, double pos, DoubleBeatsSamplesConverter const& bfc)
{
AutomationType src_type = (AutomationType)alist.parameter().type();
AutomationType dst_type = (AutomationType)_parameter.type();
if (parameter_is_midi (src_type) == parameter_is_midi (dst_type)) {
return ControlList::paste (alist, pos);
}
- bool to_frame = parameter_is_midi (src_type);
+ bool to_sample = parameter_is_midi (src_type);
ControlList cl (alist);
cl.clear ();
for (const_iterator i = alist.begin ();i != alist.end (); ++i) {
double when = (*i)->when;
- if (to_frame) {
+ if (to_sample) {
when = bfc.to ((*i)->when);
} else {
when = bfc.from ((*i)->when);
XMLNode&
AutomationList::get_state ()
{
- return state (true);
+ return state (true, true);
}
XMLNode&
-AutomationList::state (bool full)
+AutomationList::state (bool save_auto_state, bool need_lock)
{
XMLNode* root = new XMLNode (X_("AutomationList"));
- LocaleGuard lg;
root->set_property ("automation-id", EventTypeMap::instance().to_symbol(_parameter));
root->set_property ("id", id());
root->set_property ("interpolation-style", _interpolation);
- if (full) {
+ if (save_auto_state) {
/* never serialize state with Write enabled - too dangerous
for the user's data
*/
}
if (!_events.empty()) {
- root->add_child_nocopy (serialize_events());
+ root->add_child_nocopy (serialize_events (need_lock));
}
return *root;
}
XMLNode&
-AutomationList::serialize_events ()
+AutomationList::serialize_events (bool need_lock)
{
XMLNode* node = new XMLNode (X_("events"));
stringstream str;
+ Glib::Threads::RWLock::ReaderLock lm (Evoral::ControlList::_lock, Glib::Threads::NOT_LOCK);
+ if (need_lock) {
+ lm.acquire ();
+ }
for (iterator xx = _events.begin(); xx != _events.end(); ++xx) {
str << PBD::to_string ((*xx)->when);
str << ' ';
ok = false;
break;
}
+ y = std::min ((double)_desc.upper, std::max ((double)_desc.lower, y));
fast_simple_add (x, y);
}
int
AutomationList::set_state (const XMLNode& node, int version)
{
- LocaleGuard lg;
XMLNodeList nlist = node.children();
XMLNode* nsos;
XMLNodeIterator niter;
continue;
}
+ y = std::min ((double)_desc.upper, std::max ((double)_desc.lower, y));
fast_simple_add (x, y);
}
}
if (!node.get_property (X_("interpolation-style"), _interpolation)) {
- _interpolation = Linear;
+ _interpolation = default_interpolation ();
}
if (node.get_property (X_("state"), _state)) {
boost::shared_ptr<AutomationList> (new AutomationList (*this->_current.get()))
);
}
-
projects / ardour.git / blobdiff