ardour/livetrax
13
0
Fork 0
Code

Add flag to explicitly hide a control

Browse Source 
Eventually this is to replace a literal name "hidden" that is
currently used as hack throughout Ardour's codebase.
This commit is contained in:
Robin Gareus 2020-03-18 16:56:27 +01:00
parent 66d1b51392
commit 28f15d3fa6
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/automatable.cc
View File

@ -178,7 +178,9 @@ Automatable::add_control(boost::shared_ptr<Evoral::Control> ac)
ControlSet::add_control (ac); ControlSet::add_control (ac);
if ((!actl || !(actl->flags() & Controllable::NotAutomatable)) && al) { if ((!actl || !(actl->flags() & Controllable::NotAutomatable)) && al) {
_can_automate_list.insert (param); if (!actl || !(actl->flags() & Controllable::HiddenControl)) {
can_automate (param);
}
automation_list_automation_state_changed (param, al->automation_state ()); // sync everything up automation_list_automation_state_changed (param, al->automation_state ()); // sync everything up
} }
} }
@ -264,7 +266,9 @@ Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter le
boost::shared_ptr<AutomationControl> actl = automation_control (param); boost::shared_ptr<AutomationControl> actl = automation_control (param);
if (actl && (*niter)->children().size() > 0 && Config->get_limit_n_automatables () > 0) { if (actl && (*niter)->children().size() > 0 && Config->get_limit_n_automatables () > 0) {
actl->clear_flag (Controllable::NotAutomatable); actl->clear_flag (Controllable::NotAutomatable);
can_automate (param); if (!(actl->flags() & Controllable::HiddenControl) && actl->name() != X_("hidden")) {
can_automate (param);
}
info << "Marked parmater as automatable" << endl; info << "Marked parmater as automatable" << endl;
} else { } else {
warning << "Ignored automation data for non-automatable parameter" << endl; warning << "Ignored automation data for non-automatable parameter" << endl;

1
libs/pbd/enums.cc
View File

@ -41,6 +41,7 @@ setup_libpbd_enums ()
REGISTER_CLASS_ENUM (Controllable, RealTime); REGISTER_CLASS_ENUM (Controllable, RealTime);
REGISTER_CLASS_ENUM (Controllable, NotAutomatable); REGISTER_CLASS_ENUM (Controllable, NotAutomatable);
REGISTER_CLASS_ENUM (Controllable, InlineControl); REGISTER_CLASS_ENUM (Controllable, InlineControl);
REGISTER_CLASS_ENUM (Controllable, HiddenControl);
REGISTER_BITS (controllable_flags); REGISTER_BITS (controllable_flags);
REGISTER_CLASS_ENUM (Controllable, InverseGroup); REGISTER_CLASS_ENUM (Controllable, InverseGroup);

1
libs/pbd/pbd/controllable.h
View File

@ -78,6 +78,7 @@ public:
RealTime = 0x04, RealTime = 0x04,
NotAutomatable = 0x08, NotAutomatable = 0x08,
InlineControl = 0x10, InlineControl = 0x10,
HiddenControl = 0x20,
}; };
Controllable (const std::string& name, Flag f = Flag (0)); Controllable (const std::string& name, Flag f = Flag (0));