projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove ControlOnly port flag, since it was essentially unusable
[ardour.git]
/
libs
/
ardour
/
automation_control.cc
diff --git
a/libs/ardour/automation_control.cc
b/libs/ardour/automation_control.cc
index 8ffbd2d7df2a4cb2380fddd78d909c6c9fe882f3..9a6590ebe845bd442a7011d5a0e941c2f97246de 100644
(file)
--- 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 "ardour/event_type_map.h"
#include "ardour/session.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
#ifdef COMPILER_MSVC
#include <float.h>
#ifdef COMPILER_MSVC
#include <float.h>
@@
-49,12
+49,17
@@
AutomationControl::AutomationControl(ARDOUR::Session& s
const Evoral::Parameter& parameter,
const ParameterDescriptor& desc,
boost::shared_ptr<ARDOUR::AutomationList> list,
const Evoral::Parameter& parameter,
const ParameterDescriptor& desc,
boost::shared_ptr<ARDOUR::AutomationList> 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)
{
, Evoral::Control(parameter, desc, list)
, _session(session)
, _desc(desc)
{
+ if (_desc.toggled) {
+ set_flags (Controllable::Toggle);
+ }
}
AutomationControl::~AutomationControl ()
}
AutomationControl::~AutomationControl ()
@@
-115,14
+120,14
@@
void
AutomationControl::actually_set_value (double value, PBD::Controllable::GroupControlDisposition gcd)
{
bool to_list = _list && boost::dynamic_pointer_cast<AutomationList>(_list)->automation_write();
AutomationControl::actually_set_value (double value, PBD::Controllable::GroupControlDisposition gcd)
{
bool to_list = _list && boost::dynamic_pointer_cast<AutomationList>(_list)->automation_write();
- const double old_value = Control::user_double ();
+
//
const double old_value = Control::user_double ();
Control::set_double (value, _session.transport_frame(), to_list);
Control::set_double (value, _session.transport_frame(), to_list);
- AutomationType at = (AutomationType) _parameter.type();
+ //AutomationType at = (AutomationType) _parameter.type();
+ //std::cerr << "++++ Changed (" << enum_2_string (at) << ", " << enum_2_string (gcd) << ") = " << value
+ //<< " (was " << old_value << ") @ " << this << std::endl;
- std::cerr << "++++ Changed (" << enum_2_string (at) << ", " << enum_2_string (gcd) << ") = " << value
- << " (was " << old_value << ") @ " << this << std::endl;
Changed (true, gcd);
}
Changed (true, gcd);
}
@@
-136,8
+141,13
@@
AutomationControl::set_list (boost::shared_ptr<Evoral::ControlList> list)
void
AutomationControl::set_automation_state (AutoState as)
{
void
AutomationControl::set_automation_state (AutoState as)
{
+ if (flags() & NotAutomatable) {
+ return;
+ }
if (_list && as != alist()->automation_state()) {
if (_list && as != alist()->automation_state()) {
+ const double val = get_value ();
+
alist()->set_automation_state (as);
if (_desc.toggled) {
return; // No watch for boolean automation
alist()->set_automation_state (as);
if (_desc.toggled) {
return; // No watch for boolean automation
@@
-146,6
+156,11
@@
AutomationControl::set_automation_state (AutoState as)
if (as == Write) {
AutomationWatch::instance().add_automation_watch (shared_from_this());
} else if (as == Touch) {
if (as == Write) {
AutomationWatch::instance().add_automation_watch (shared_from_this());
} else if (as == Touch) {
+ if (alist()->empty()) {
+ Control::set_double (val, _session.current_start_frame (), true);
+ Control::set_double (val, _session.current_end_frame (), true);
+ Changed (true, Controllable::NoGroup);
+ }
if (!touching()) {
AutomationWatch::instance().remove_automation_watch (shared_from_this());
} else {
if (!touching()) {
AutomationWatch::instance().remove_automation_watch (shared_from_this());
} else {
@@
-284,7
+299,6
@@
AutomationControl::check_rt (double val, Controllable::GroupControlDisposition g
{
if (!_session.loading() && (flags() & Controllable::RealTime) && !AudioEngine::instance()->in_process_thread()) {
/* queue change in RT context */
{
if (!_session.loading() && (flags() & Controllable::RealTime) && !AudioEngine::instance()->in_process_thread()) {
/* queue change in RT context */
- std::cerr << "::set_value (" << val << ", " << enum_2_string (gcd) << ") called for " << enum_2_string ((AutomationType) _parameter.type()) << ", queueing in RT context\n";
_session.set_control (shared_from_this(), val, gcd);
return true;
}
_session.set_control (shared_from_this(), val, gcd);
return true;
}