X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomation_control.cc;h=9a6590ebe845bd442a7011d5a0e941c2f97246de;hb=47ba20143e06445a9977f4757d816439ea8042d0;hp=e0ebc00062e1b3dc751e9df7f796956fc0185eb8;hpb=b7e645ec61ab531917a03cdab14a8c22670677f7;p=ardour.git diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc index e0ebc00062..9a6590ebe8 100644 --- a/libs/ardour/automation_control.cc +++ b/libs/ardour/automation_control.cc @@ -31,7 +31,7 @@ #include "ardour/event_type_map.h" #include "ardour/session.h" -#include "i18n.h" +#include "pbd/i18n.h" #ifdef COMPILER_MSVC #include @@ -49,8 +49,10 @@ AutomationControl::AutomationControl(ARDOUR::Session& s const Evoral::Parameter& parameter, const ParameterDescriptor& desc, boost::shared_ptr list, - const string& name) - : Controllable (name.empty() ? EventTypeMap::instance().to_symbol(parameter) : name) + const string& name, + Controllable::Flag flags) + + : Controllable (name.empty() ? EventTypeMap::instance().to_symbol(parameter) : name, flags) , Evoral::Control(parameter, desc, list) , _session(session) , _desc(desc) @@ -123,7 +125,7 @@ AutomationControl::actually_set_value (double value, PBD::Controllable::GroupCon Control::set_double (value, _session.transport_frame(), to_list); //AutomationType at = (AutomationType) _parameter.type(); - //std::cerr << "++++ Changed (" << enum_2_string (at) << ", " << enum_2_string (gcd) << ") = " << value + //std::cerr << "++++ Changed (" << enum_2_string (at) << ", " << enum_2_string (gcd) << ") = " << value //<< " (was " << old_value << ") @ " << this << std::endl; Changed (true, gcd); @@ -155,7 +157,8 @@ AutomationControl::set_automation_state (AutoState as) AutomationWatch::instance().add_automation_watch (shared_from_this()); } else if (as == Touch) { if (alist()->empty()) { - Control::set_double (val, _session.transport_frame(), true); + Control::set_double (val, _session.current_start_frame (), true); + Control::set_double (val, _session.current_end_frame (), true); Changed (true, Controllable::NoGroup); } if (!touching()) {