X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fslavable_automation_control.cc;h=0bfa2b72496d2b6278e8fd889a124d19803d8641;hb=84272b4e27e537bf2c38c9cd25675c61addea40a;hp=cb88d36fe9c55b023ce9c0e5f5a98b67359f05c6;hpb=22bddf543421f2a75a5a807009ea3e96dcb26cac;p=ardour.git diff --git a/libs/ardour/slavable_automation_control.cc b/libs/ardour/slavable_automation_control.cc index cb88d36fe9..0bfa2b7249 100644 --- a/libs/ardour/slavable_automation_control.cc +++ b/libs/ardour/slavable_automation_control.cc @@ -21,8 +21,8 @@ #include "pbd/enumwriter.h" #include "pbd/error.h" +#include "pbd/memento_command.h" #include "pbd/types_convert.h" -#include "pbd/i18n.h" #include "evoral/Curve.hpp" @@ -31,6 +31,8 @@ #include "ardour/slavable_automation_control.h" #include "ardour/session.h" +#include "pbd/i18n.h" + using namespace std; using namespace ARDOUR; using namespace PBD; @@ -82,7 +84,7 @@ SlavableAutomationControl::get_value_locked() const /* read or write masters lock must be held */ if (_masters.empty()) { - return Control::get_double (false, _session.transport_frame()); + return Control::get_double (false, _session.transport_sample()); } if (_desc.toggled) { @@ -90,7 +92,7 @@ SlavableAutomationControl::get_value_locked() const * enabled, this slave is enabled. So check our own value * first, because if we are enabled, we can return immediately. */ - if (Control::get_double (false, _session.transport_frame())) { + if (Control::get_double (false, _session.transport_sample())) { return _desc.upper; } } @@ -112,12 +114,12 @@ SlavableAutomationControl::get_value() const } return get_value_locked (); } else { - return Control::get_double (true, _session.transport_frame()) * get_masters_value_locked(); + return Control::get_double (true, _session.transport_sample()) * get_masters_value_locked(); } } bool -SlavableAutomationControl::get_masters_curve_locked (framepos_t, framepos_t, float*, framecnt_t) const +SlavableAutomationControl::get_masters_curve_locked (samplepos_t, samplepos_t, float*, samplecnt_t) const { /* Every AutomationControl needs to implement this as-needed. * @@ -129,13 +131,13 @@ SlavableAutomationControl::get_masters_curve_locked (framepos_t, framepos_t, flo } bool -SlavableAutomationControl::masters_curve_multiply (framepos_t start, framepos_t end, float* vec, framecnt_t veclen) const +SlavableAutomationControl::masters_curve_multiply (samplepos_t start, samplepos_t end, float* vec, samplecnt_t veclen) const { gain_t* scratch = _session.scratch_automation_buffer (); bool from_list = _list && boost::dynamic_pointer_cast(_list)->automation_playback(); bool rv = from_list && list()->curve().rt_safe_get_vector (start, end, scratch, veclen); if (rv) { - for (framecnt_t i = 0; i < veclen; ++i) { + for (samplecnt_t i = 0; i < veclen; ++i) { vec[i] *= scratch[i]; } } else { @@ -183,7 +185,7 @@ SlavableAutomationControl::actually_set_value (double value, PBD::Controllable:: } void -SlavableAutomationControl::add_master (boost::shared_ptr m, bool loading) +SlavableAutomationControl::add_master (boost::shared_ptr m) { std::pair res; @@ -289,11 +291,7 @@ SlavableAutomationControl::master_changed (bool /*from_self*/, GroupControlDispo { boost::shared_ptr m = wm.lock (); assert (m); - Glib::Threads::RWLock::ReaderLock lm (master_lock, Glib::Threads::TRY_LOCK); - if (!lm.locked ()) { - /* boolean_automation_run_locked () special case */ - return; - } + Glib::Threads::RWLock::ReaderLock lm (master_lock); bool send_signal = handle_master_change (m); lm.release (); // update_boolean_masters_records() takes lock @@ -316,7 +314,14 @@ double SlavableAutomationControl::scale_automation_callback (double value, double ratio) const { /* derived classes can override this and e.g. add/subtract. */ - value *= ratio; + if (toggled ()) { + // XXX we should use the master's upper/lower as threshold + if (ratio >= 0.5 * (upper () - lower ())) { + value = upper (); + } + } else { + value *= ratio; + } value = std::max (lower(), std::min(upper(), value)); return value; } @@ -335,7 +340,7 @@ SlavableAutomationControl::remove_master (boost::shared_ptr m bool update_value = false; double master_ratio = 0; - double list_ratio = 1; + double list_ratio = toggled () ? 0 : 1; boost::shared_ptr master; @@ -366,13 +371,20 @@ SlavableAutomationControl::remove_master (boost::shared_ptr m /* ..and update automation */ if (_list) { + XMLNode* before = &alist ()->get_state (); if (master->automation_playback () && master->list()) { _list->list_merge (*master->list().get(), boost::bind (&SlavableAutomationControl::scale_automation_callback, this, _1, _2)); + printf ("y-t %s %f\n", name().c_str(), list_ratio); _list->y_transform (boost::bind (&SlavableAutomationControl::scale_automation_callback, this, _1, list_ratio)); } else { // do we need to freeze/thaw the list? probably no: iterators & positions don't change _list->y_transform (boost::bind (&SlavableAutomationControl::scale_automation_callback, this, _1, master_ratio)); } + XMLNode* after = &alist ()->get_state (); + if (*before != *after) { + _session.begin_reversible_command (string_compose (_("Merge VCA automation into %1"), name ())); + _session.commit_reversible_command (alist()->memento_command (before, after)); + } } } @@ -396,7 +408,7 @@ SlavableAutomationControl::clear_masters () ControlList masters; bool update_value = false; double master_ratio = 0; - double list_ratio = 1; + double list_ratio = toggled () ? 0 : 1; /* null ptr means "all masters */ pre_remove_master (boost::shared_ptr()); @@ -432,6 +444,7 @@ SlavableAutomationControl::clear_masters () /* ..and update automation */ if (_list) { + XMLNode* before = &alist ()->get_state (); if (!masters.empty()) { for (ControlList::const_iterator m = masters.begin(); m != masters.end(); ++m) { _list->list_merge (*(*m)->list().get(), boost::bind (&SlavableAutomationControl::scale_automation_callback, this, _1, _2)); @@ -440,6 +453,11 @@ SlavableAutomationControl::clear_masters () } else { _list->y_transform (boost::bind (&SlavableAutomationControl::scale_automation_callback, this, _1, master_ratio)); } + XMLNode* after = &alist ()->get_state (); + if (*before != *after) { + _session.begin_reversible_command (string_compose (_("Merge VCA automation into %1"), name ())); + _session.commit_reversible_command (alist()->memento_command (before, after)); + } } } @@ -508,8 +526,30 @@ SlavableAutomationControl::handle_master_change (boost::shared_ptrrt_safe_eval (start, valid); + if (!valid) { + return; + } + if (toggled ()) { + const double thresh = .5 * (_desc.upper - _desc.lower); + bool on = (val >= thresh) || (get_masters_value () >= thresh); + set_value_unchecked (on ? _desc.upper : _desc.lower); + } else { + set_value_unchecked (val * get_masters_value ()); + } +} + bool -SlavableAutomationControl::boolean_automation_run_locked (framepos_t start, pframes_t len) +SlavableAutomationControl::boolean_automation_run_locked (samplepos_t start, pframes_t len) { bool rv = false; if (!_desc.toggled) { @@ -538,18 +578,13 @@ SlavableAutomationControl::boolean_automation_run_locked (framepos_t start, pfra if (mr->second.yn() != yn) { rv |= handle_master_change (ac); mr->second.set_yn (yn); - /* notify the GUI, without recursion: - * master_changed() above will ignore the change if the lock is held. - */ - ac->set_value_unchecked (yn ? 1. : 0.); - ac->Changed (false, Controllable::NoGroup); /* EMIT SIGNAL */ } } return rv; } bool -SlavableAutomationControl::boolean_automation_run (framepos_t start, pframes_t len) +SlavableAutomationControl::boolean_automation_run (samplepos_t start, pframes_t len) { bool change = false; {