NO-OP: use set/clear_flag() API instead of set_flags()

9 files changed, 13 insertions, 13 deletions

diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index 3486812443..bc5da94500 100644
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -263,7 +263,7 @@ Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter le
 			if (_can_automate_list.find (param) == _can_automate_list.end ()) {
 				boost::shared_ptr<AutomationControl> actl = automation_control (param);
 				if (actl && (*niter)->children().size() > 0 && Config->get_limit_n_automatables () > 0) {
-					actl->set_flags (Controllable::Flag ((int)actl->flags() & ~Controllable::NotAutomatable));
+					actl->clear_flag (Controllable::NotAutomatable);
 					can_automate (param);
 					info << "Marked parmater as automatable" << endl;
 				} else {
diff --git a/libs/ardour/monitor_control.cc b/libs/ardour/monitor_control.cc
index 6bedb80d39..0d0a98ca87 100644
--- a/libs/ardour/monitor_control.cc
+++ b/libs/ardour/monitor_control.cc
@@ -34,7 +34,7 @@ MonitorControl::MonitorControl (Session& session, std::string const & name, Moni
 {
 	_list->set_interpolation(Evoral::ControlList::Discrete);
 	/* monitoring changes must be synchronized by the process cycle */
-	set_flags (Controllable::Flag (flags() | Controllable::RealTime));
+	set_flag (Controllable::RealTime);
 }
 
 void
diff --git a/libs/ardour/mute_control.cc b/libs/ardour/mute_control.cc
index 530ca7bac8..aa1de9e8bc 100644
--- a/libs/ardour/mute_control.cc
+++ b/libs/ardour/mute_control.cc
@@ -37,7 +37,7 @@ MuteControl::MuteControl (Session& session, std::string const & name, Muteable&
 {
 	_list->set_interpolation (Evoral::ControlList::Discrete);
 	/* mute changes must be synchronized by the process cycle */
-	set_flags (Controllable::Flag (flags() | Controllable::RealTime));
+	set_flag (Controllable::RealTime);
 }
 
 void
diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc
index bf4eb38fe2..0f78777d13 100644
--- a/libs/ardour/plugin_insert.cc
+++ b/libs/ardour/plugin_insert.cc
@@ -487,10 +487,10 @@ PluginInsert::create_automatable_parameters ()
 		boost::shared_ptr<AutomationList> list(new AutomationList(param, desc));
 		boost::shared_ptr<AutomationControl> c (new PluginControl(this, param, desc, list));
 		if (!automatable || (limit_automatables > 0 && what_can_be_automated ().size() > limit_automatables)) {
-			c->set_flags (Controllable::Flag ((int)c->flags() | Controllable::NotAutomatable));
+			c->set_flag (Controllable::NotAutomatable);
 		}
 		if (desc.inline_ctrl) {
-			c->set_flags (Controllable::Flag ((int)c->flags() | Controllable::InlineControl));
+			c->set_flag (Controllable::InlineControl);
 		}
 		add_control (c);
 		plugin->set_automation_control (i, c);
@@ -508,7 +508,7 @@ PluginInsert::create_automatable_parameters ()
 			}
 			boost::shared_ptr<AutomationControl> c (new PluginPropertyControl(this, param, desc, list));
 			if (!Variant::type_is_numeric(desc.datatype)) {
-				c->set_flags (Controllable::Flag ((int)c->flags() | Controllable::NotAutomatable));
+				c->set_flag (Controllable::NotAutomatable);
 			}
 			add_control (c);
 		}
diff --git a/libs/ardour/record_enable_control.cc b/libs/ardour/record_enable_control.cc
index 5ed70bf2f7..a789b39e11 100644
--- a/libs/ardour/record_enable_control.cc
+++ b/libs/ardour/record_enable_control.cc
@@ -33,7 +33,7 @@ RecordEnableControl::RecordEnableControl (Session& session, std::string const &
 	_list->set_interpolation(Evoral::ControlList::Discrete);
 
 	/* record-enable changes must be synchronized by the process cycle */
-	set_flags (Controllable::Flag (flags() | Controllable::RealTime));
+	set_flag (Controllable::RealTime);
 }
 
 void
diff --git a/libs/ardour/record_safe_control.cc b/libs/ardour/record_safe_control.cc
index 6e3d531398..6fce4f028e 100644
--- a/libs/ardour/record_safe_control.cc
+++ b/libs/ardour/record_safe_control.cc
@@ -33,7 +33,7 @@ RecordSafeControl::RecordSafeControl (Session& session, std::string const & name
 	_list->set_interpolation(Evoral::ControlList::Discrete);
 
 	/* record-enable changes must be synchronized by the process cycle */
-	set_flags (Controllable::Flag (flags() | Controllable::RealTime));
+	set_flag (Controllable::RealTime);
 }
 
 void
diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 7202924906..d96bc2db58 100644
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -97,7 +97,7 @@ Send::Send (Session& s, boost::shared_ptr<Pannable> p, boost::shared_ptr<MuteMas
 
 	boost::shared_ptr<AutomationList> gl (new AutomationList (Evoral::Parameter (BusSendLevel)));
 	_gain_control = boost::shared_ptr<GainControl> (new GainControl (_session, Evoral::Parameter(BusSendLevel), gl));
-	_gain_control->set_flags (Controllable::Flag ((int)_gain_control->flags() | Controllable::InlineControl));
+	_gain_control->set_flag (Controllable::InlineControl);
 	add_control (_gain_control);
 
 	_amp.reset (new Amp (_session, _("Fader"), _gain_control, true));
@@ -294,7 +294,7 @@ Send::set_state (const XMLNode& node, int version)
 		 * this is mainly relevant for Mixbus6.0, copy/paste aux-sends.
 		 * -> remove me after 6.1
 		 */
-		_gain_control->set_flags (Controllable::Flag ((int)_gain_control->flags() | Controllable::InlineControl));
+		_gain_control->set_flag (Controllable::InlineControl);
 #endif
 	}
 
@@ -314,7 +314,7 @@ Send::set_state (const XMLNode& node, int version)
 				nn = processor;
 				if ((gain_node = nn->child (Controllable::xml_node_name.c_str ())) != 0) {
 					_gain_control->set_state (*gain_node, version);
-					_gain_control->set_flags (Controllable::Flag ((int)_gain_control->flags() | Controllable::InlineControl));
+					_gain_control->set_flags (Controllable::InlineControl);
 				}
 			}
 		}
diff --git a/libs/ardour/solo_control.cc b/libs/ardour/solo_control.cc
index 9d6d5d347c..f194047559 100644
--- a/libs/ardour/solo_control.cc
+++ b/libs/ardour/solo_control.cc
@@ -41,7 +41,7 @@ SoloControl::SoloControl (Session& session, std::string const & name, Soloable&
 {
 	_list->set_interpolation (Evoral::ControlList::Discrete);
 	/* solo changes must be synchronized by the process cycle */
-	set_flags (Controllable::Flag (flags() | Controllable::RealTime));
+	set_flag (Controllable::RealTime);
 }
 
 void
diff --git a/libs/ardour/solo_isolate_control.cc b/libs/ardour/solo_isolate_control.cc
index acdef62bf7..34ce067fd7 100644
--- a/libs/ardour/solo_isolate_control.cc
+++ b/libs/ardour/solo_isolate_control.cc
@@ -39,7 +39,7 @@ SoloIsolateControl::SoloIsolateControl (Session& session, std::string const & na
 {
 	_list->set_interpolation (Evoral::ControlList::Discrete);
 	/* isolate changes must be synchronized by the process cycle */
-	set_flags (Controllable::Flag (flags() | Controllable::RealTime));
+	set_flag (Controllable::RealTime);
 }
 
 void