: 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);
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
double
AutomationControl::get_value() const
{
- bool from_list = _list && boost::dynamic_pointer_cast<AutomationList>(_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
}
void
-AutomationControl::automation_run (framepos_t start, pframes_t nframes)
+AutomationControl::automation_run (samplepos_t start, pframes_t nframes)
{
if (!automation_playback ()) {
return;
void
AutomationControl::actually_set_value (double value, PBD::Controllable::GroupControlDisposition gcd)
{
- boost::shared_ptr<AutomationList> al = boost::dynamic_pointer_cast<AutomationList> (_list);
- const framepos_t pos = _session.transport_frame();
+ boost::shared_ptr<AutomationList> al = alist ();
+ const samplepos_t pos = _session.transport_sample();
bool to_list;
/* We cannot use ::get_value() here since that is virtual, and intended
if (flags() & NotAutomatable) {
return;
}
- if (_list && as != alist()->automation_state()) {
+ if (alist() && as != alist()->automation_state()) {
const double val = get_value ();
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()) {
}
} 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());
}
}
}
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<AutomationList> (*alist ().get (), alist ()->before (), &alist ()->get_state ()));
+ _session.commit_reversible_command (alist ()->memento_command (before, &alist ()->get_state ()));
}
} else {
alist ()->clear_history ();