X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomation_control.cc;h=5755e04aacc7e04210acebd7c52eb8ad6ee93b4f;hb=5fa05b403ca21a6573d07b921dc14f0769dc9fc7;hp=30eb19fd5a54fa015fffbb72aa7d9c4a07203ccf;hpb=37905d82a611a09342faf52d01378c9b4e86a2ac;p=ardour.git diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc index 30eb19fd5a..5755e04aac 100644 --- a/libs/ardour/automation_control.cc +++ b/libs/ardour/automation_control.cc @@ -56,8 +56,9 @@ AutomationControl::AutomationControl(ARDOUR::Session& s : Controllable (name.empty() ? EventTypeMap::instance().to_symbol(parameter) : name, flags) , Evoral::Control(parameter, desc, list) - , _session(session) + , SessionHandleRef (session) , _desc(desc) + , _no_session(false) { if (_desc.toggled) { set_flags (Controllable::Toggle); @@ -70,8 +71,18 @@ AutomationControl::AutomationControl(ARDOUR::Session& s AutomationControl::~AutomationControl () { - _session.selection().remove_control_by_id (id()); + if (!_no_session && !_session.deletion_in_progress ()) { + _session.selection().remove_control_by_id (id()); + DropReferences (); /* EMIT SIGNAL */ + } +} + +void +AutomationControl::session_going_away () +{ + SessionHandleRef::session_going_away (); DropReferences (); /* EMIT SIGNAL */ + _no_session = true; } bool @@ -88,8 +99,8 @@ AutomationControl::writable() const double AutomationControl::get_value() const { - bool from_list = _list && boost::dynamic_pointer_cast(_list)->automation_playback(); - return Control::get_double (from_list, _session.transport_frame()); + bool from_list = alist() && alist()->automation_playback(); + return Control::get_double (from_list, _session.transport_sample()); } double @@ -136,6 +147,37 @@ AutomationControl::set_value (double val, PBD::Controllable::GroupControlDisposi } } +ControlList +AutomationControl::grouped_controls () const +{ + if (_group && _group->use_me (PBD::Controllable::UseGroup)) { + return _group->controls (); + } else { + return ControlList (); + } +} + +void +AutomationControl::automation_run (samplepos_t start, pframes_t nframes) +{ + if (!automation_playback ()) { + return; + } + + assert (_list); + bool valid = false; + double val = _list->rt_safe_eval (start, valid); + if (!valid) { + return; + } + if (toggled ()) { + const double thresh = .5 * (_desc.upper - _desc.lower); + set_value_unchecked (val >= thresh ? _desc.upper : _desc.lower); + } else { + set_value_unchecked (val); + } +} + /** Set the value and do the right thing based on automation state * (e.g. record if necessary, etc.) * @param value `user' value @@ -143,10 +185,9 @@ AutomationControl::set_value (double val, PBD::Controllable::GroupControlDisposi void AutomationControl::actually_set_value (double value, PBD::Controllable::GroupControlDisposition gcd) { - boost::shared_ptr al = boost::dynamic_pointer_cast (_list); - const framepos_t pos = _session.transport_frame(); + boost::shared_ptr al = alist (); + const samplepos_t pos = _session.transport_sample(); bool to_list; - double old_value; /* We cannot use ::get_value() here since that is virtual, and intended to return a scalar value that in some way reflects the state of the @@ -163,36 +204,28 @@ AutomationControl::actually_set_value (double value, PBD::Controllable::GroupCon anything has changed) is the one derived from the automation event list. */ + float old_value = Control::user_double(); - if (!al) { - to_list = false; - old_value = Control::user_double(); + if (al && al->automation_write ()) { + to_list = true; } else { - if (al->automation_write ()) { - to_list = true; - old_value = Control::user_double (); - } else if (al->automation_playback()) { - to_list = false; - old_value = al->eval (pos); - } else { - to_list = false; - old_value = Control::user_double (); - } + to_list = false; } Control::set_double (value, pos, to_list); - if (old_value != value) { - //AutomationType at = (AutomationType) _parameter.type(); - //std::cerr << "++++ Changed (" << enum_2_string (at) << ", " << enum_2_string (gcd) << ") = " << value - //<< " (was " << old_value << ") @ " << this << std::endl; + if (old_value != (float)value) { +#if 0 + AutomationType at = (AutomationType) _parameter.type(); + std::cerr << "++++ Changed (" << enum_2_string (at) << ", " << enum_2_string (gcd) << ") = " << value + << " (was " << old_value << ") @ " << this << std::endl; +#endif Changed (true, gcd); if (!al || !al->automation_playback ()) { _session.set_dirty (); } } - } void @@ -208,7 +241,7 @@ AutomationControl::set_automation_state (AutoState as) if (flags() & NotAutomatable) { return; } - if (_list && as != alist()->automation_state()) { + if (alist() && as != alist()->automation_state()) { const double val = get_value (); @@ -220,10 +253,10 @@ AutomationControl::set_automation_state (AutoState as) if (as == Write) { AutomationWatch::instance().add_automation_watch (shared_from_this()); - } else if (as == Touch) { + } else if (as & (Touch | Latch)) { if (alist()->empty()) { - Control::set_double (val, _session.current_start_frame (), true); - Control::set_double (val, _session.current_end_frame (), true); + Control::set_double (val, _session.current_start_sample (), true); + Control::set_double (val, _session.current_end_sample (), true); Changed (true, Controllable::NoGroup); } if (!touching()) { @@ -238,48 +271,51 @@ AutomationControl::set_automation_state (AutoState as) } } else { AutomationWatch::instance().remove_automation_watch (shared_from_this()); + Changed (false, Controllable::NoGroup); } } } void -AutomationControl::start_touch(double when) +AutomationControl::start_touch (double when) { - if (!_list) { + if (!_list || touching ()) { return; } - if (!touching()) { - if (alist()->automation_state() == Touch) { - /* subtle. aligns the user value with the playback and - * use take actual value (incl masters). - * - * Touch + hold writes inverse curve of master-automation - * using AutomationWatch::timer () - */ - AutomationControl::actually_set_value (get_value (), Controllable::NoGroup); - alist()->start_touch (when); - if (!_desc.toggled) { - AutomationWatch::instance().add_automation_watch (shared_from_this()); - } + if (alist()->automation_state() & (Touch | Latch)) { + /* subtle. aligns the user value with the playback and + * use take actual value (incl masters). + * + * Touch + hold writes inverse curve of master-automation + * using AutomationWatch::timer () + */ + AutomationControl::actually_set_value (get_value (), Controllable::NoGroup); + alist()->start_touch (when); + if (!_desc.toggled) { + AutomationWatch::instance().add_automation_watch (shared_from_this()); } set_touching (true); } } void -AutomationControl::stop_touch(bool mark, double when) +AutomationControl::stop_touch (double when) { - if (!_list) return; - if (touching()) { - set_touching (false); + if (!_list || !touching ()) { + return; + } - if (alist()->automation_state() == Touch) { - alist()->stop_touch (mark, when); - if (!_desc.toggled) { - AutomationWatch::instance().remove_automation_watch (shared_from_this()); + if (alist()->automation_state() == Latch && _session.transport_rolling ()) { + return; + } - } + set_touching (false); + + if (alist()->automation_state() & (Touch | Latch)) { + alist()->stop_touch (when); + if (!_desc.toggled) { + AutomationWatch::instance().remove_automation_watch (shared_from_this()); } } } @@ -288,9 +324,10 @@ void AutomationControl::commit_transaction (bool did_write) { if (did_write) { - if (alist ()->before ()) { + XMLNode* before = alist ()->before (); + if (before) { _session.begin_reversible_command (string_compose (_("record %1 automation"), name ())); - _session.commit_reversible_command (new MementoCommand (*alist ().get (), alist ()->before (), &alist ()->get_state ())); + _session.commit_reversible_command (alist ()->memento_command (before, &alist ()->get_state ())); } } else { alist ()->clear_history ();