Prepare export-format codec-quality setting

[ardour.git] / libs / ardour / automation_list.cc

diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index 74181d551449ffb3a5ac62ebbcee0957fc42884a..cb09786c649f448b20ce948c66d0427ef74bbc01 100644 (file)
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -24,7 +24,7 @@
 #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"
@@ -161,6 +161,8 @@ AutomationList::create_curve_if_necessary()
        default:
                break;
        }
+
+       WritePassStarted.connect_same_thread (_writepass_connection, boost::bind (&AutomationList::snapshot_history, this, false));
 }
 
 AutomationList&
@@ -190,19 +192,29 @@ AutomationList::maybe_signal_changed ()
        }
 }
 
+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
@@ -212,10 +224,6 @@ AutomationList::default_interpolation () const
                case GainAutomation:
                case BusSendLevel:
                case EnvelopeAutomation:
-#ifndef XXX_NEW_INTERPOLATON__BREAK_SESSION_FORMAT_XXX
-                       /* use old, wrong linear gain interpolation */
-                       return ControlList::Linear;
-#endif
                        return ControlList::Exponential;
                        break;
                case TrimAutomation:
@@ -231,12 +239,7 @@ AutomationList::default_interpolation () const
 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);
 }
 
@@ -249,9 +252,9 @@ AutomationList::write_pass_finished (double when, double thinning_factor)
 void
 AutomationList::start_touch (double when)
 {
-        if (_state == Touch) {
+       if (_state == Touch) {
                start_write_pass (when);
-        }
+       }
 
        g_atomic_int_set (&_touching, 1);
 }
@@ -281,6 +284,17 @@ AutomationList::clear_history ()
        _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 ()
 {
@@ -293,7 +307,7 @@ 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();
@@ -301,13 +315,13 @@ AutomationList::paste (const ControlList& alist, double pos, DoubleBeatsFramesCo
        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);
@@ -326,34 +340,19 @@ AutomationList::memento_command (XMLNode* before, XMLNode* after)
 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"));
 
        root->set_property ("automation-id", EventTypeMap::instance().to_symbol(_parameter));
        root->set_property ("id", id());
-
-#ifndef XXX_NEW_INTERPOLATON__BREAK_SESSION_FORMAT_XXX
-       /* force new enums to existing ones in session-file */
-       Evoral::ControlList::InterpolationStyle is = _interpolation;
-       switch (is) {
-               case ControlList::Exponential:
-               case ControlList::Logarithmic:
-                       is = ControlList::Linear;
-                       break;
-               default:
-                       break;
-       }
-       root->set_property ("interpolation-style", is);
-#else
        root->set_property ("interpolation-style", _interpolation);
-#endif
 
-       if (full) {
+       if (save_auto_state) {
                /* never serialize state with Write enabled - too dangerous
                   for the user's data
                */
@@ -372,18 +371,22 @@ AutomationList::state (bool full)
        }
 
        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 << ' ';
@@ -522,12 +525,6 @@ AutomationList::set_state (const XMLNode& node, int version)
        if (!node.get_property (X_("interpolation-style"), _interpolation)) {
                _interpolation = default_interpolation ();
        }
-#ifndef XXX_NEW_INTERPOLATON__BREAK_SESSION_FORMAT_XXX
-       /* internally force logarithmic and Trim params to use Log-scale */
-       if (_desc.logarithmic || _parameter.type() == TrimAutomation) {
-               _interpolation = ControlList::Logarithmic;
-       }
-#endif
 
        if (node.get_property (X_("state"), _state)) {
                if (_state == Write) {
@@ -578,4 +575,3 @@ AutomationListProperty::clone () const
                boost::shared_ptr<AutomationList> (new AutomationList (*this->_current.get()))
                );
 }
-