NO-OP: whitespace

6 files changed, 53 insertions, 57 deletions

diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h
index e338cb13c1..a16929afa5 100644
--- a/libs/ardour/ardour/automation_control.h
+++ b/libs/ardour/ardour/automation_control.h
@@ -53,7 +53,7 @@ class LIBARDOUR_API AutomationControl
 	, public boost::enable_shared_from_this<AutomationControl>
 	, public ControlGroupMember
 {
-    public:
+public:
 	AutomationControl(ARDOUR::Session&,
 	                  const Evoral::Parameter&                  parameter,
 	                  const ParameterDescriptor&                desc,
@@ -123,7 +123,7 @@ class LIBARDOUR_API AutomationControl
 	const ARDOUR::Session& session() const { return _session; }
 	void commit_transaction (bool did_write);
 
-  protected:
+protected:
 	ARDOUR::Session& _session;
 	boost::shared_ptr<ControlGroup> _group;
 
@@ -147,7 +147,7 @@ class LIBARDOUR_API AutomationControl
 	/* this will be invoked in turn on behalf of the group or the control by itself */
 	virtual void do_pre_realtime_queue_stuff (double new_value) {}
 
-  private:
+private:
 	/* I am unclear on why we have to make ControlGroup a friend in order
 	   to get access to the ::set_group() method when it is already
 	   declared to be a friend in ControlGroupMember. Oh well.
diff --git a/libs/ardour/ardour/mute_control.h b/libs/ardour/ardour/mute_control.h
index 399b708d43..aeeccceab6 100644
--- a/libs/ardour/ardour/mute_control.h
+++ b/libs/ardour/ardour/mute_control.h
@@ -35,7 +35,7 @@ class Muteable;
 
 class LIBARDOUR_API MuteControl : public SlavableAutomationControl
 {
-  public:
+public:
 	MuteControl (Session& session, std::string const& name, Muteable&);
 
 	double get_value () const;
@@ -70,14 +70,14 @@ class LIBARDOUR_API MuteControl : public SlavableAutomationControl
 
 	void automation_run (framepos_t start, pframes_t nframes);
 
-  protected:
+protected:
 	void master_changed (bool, PBD::Controllable::GroupControlDisposition, boost::shared_ptr<AutomationControl>);
 	void actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override);
 
 	void pre_remove_master (boost::shared_ptr<AutomationControl>);
 	void post_add_master (boost::shared_ptr<AutomationControl>);
 
-  private:
+private:
 	Muteable& _muteable;
 };
 
diff --git a/libs/ardour/ardour/mute_master.h b/libs/ardour/ardour/mute_master.h
index f73ce09565..d0e261e059 100644
--- a/libs/ardour/ardour/mute_master.h
+++ b/libs/ardour/ardour/mute_master.h
@@ -37,7 +37,7 @@ class Muteable;
 
 class LIBARDOUR_API MuteMaster : public SessionHandleRef, public PBD::Stateful
 {
-  public:
+public:
 	/** deliveries to mute when the channel is "muted" */
 	enum MutePoint {
 		PreFader  = 0x1, ///< mute all pre-fader sends
@@ -79,7 +79,7 @@ class LIBARDOUR_API MuteMaster : public SessionHandleRef, public PBD::Stateful
 	int set_state(const XMLNode&, int version);
 	static const std::string xml_node_name;
 
-  private:
+private:
 	Muteable* _muteable;
 	MutePoint _mute_point;
 	bool      _muted_by_self;
diff --git a/libs/ardour/ardour/muteable.h b/libs/ardour/ardour/muteable.h
index adc4259a31..dba339ea86 100644
--- a/libs/ardour/ardour/muteable.h
+++ b/libs/ardour/ardour/muteable.h
@@ -29,7 +29,7 @@ class MuteMaster;
 class Session;
 
 class Muteable {
-    public:
+public:
 	Muteable (Session&, std::string const &name);
 	virtual ~Muteable() {}
 
@@ -43,7 +43,7 @@ class Muteable {
 
 	PBD::Signal0<void> mute_points_changed;
 
-    protected:
+protected:
 	boost::shared_ptr<MuteMaster> _mute_master;
 };
 
diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index d10fafdeb1..417110e433 100644
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -69,12 +69,9 @@ Automatable::Automatable (const Automatable& other)
 
 Automatable::~Automatable ()
 {
-	{
-		Glib::Threads::Mutex::Lock lm (_control_lock);
-
-		for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) {
-			boost::dynamic_pointer_cast<AutomationControl>(li->second)->drop_references ();
-		}
+	Glib::Threads::Mutex::Lock lm (_control_lock);
+	for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) {
+		boost::dynamic_pointer_cast<AutomationControl>(li->second)->drop_references ();
 	}
 }
 
diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc
index 52af8c3861..9cc424b84d 100644
--- a/libs/ardour/mute_master.cc
+++ b/libs/ardour/mute_master.cc
@@ -1,5 +1,4 @@
 /*
-
     Copyright (C) 2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
@@ -44,9 +43,9 @@ MuteMaster::MuteMaster (Session& s, Muteable& m, const std::string&)
 	: SessionHandleRef (s)
 	, _muteable (&m)
 	, _mute_point (MutePoint (0))
-        , _muted_by_self (false)
-        , _soloed_by_self (false)
-        , _soloed_by_others (false)
+	, _muted_by_self (false)
+	, _soloed_by_self (false)
+	, _soloed_by_others (false)
 	, _muted_by_masters (0)
 {
 
@@ -88,56 +87,56 @@ MuteMaster::unmute_at (MutePoint mp)
 gain_t
 MuteMaster::mute_gain_at (MutePoint mp) const
 {
-        gain_t gain;
-
-        if (Config->get_solo_mute_override()) {
-                if (_soloed_by_self) {
-                        gain = GAIN_COEFF_UNITY;
-                } else if (muted_by_self_at (mp) || muted_by_masters_at (mp)) {
-                        gain = GAIN_COEFF_ZERO;
-                } else {
-	                if (!_soloed_by_others && muted_by_others_soloing_at (mp)) {
-                                gain = Config->get_solo_mute_gain ();
-                        } else {
-                                gain = GAIN_COEFF_UNITY;
-                        }
-                }
-        } else {
-	        if (muted_by_self_at (mp) || muted_by_masters_at (mp)) {
-                        gain = GAIN_COEFF_ZERO;
-                } else if (_soloed_by_self || _soloed_by_others) {
-                        gain = GAIN_COEFF_UNITY;
-                } else {
-                        if (muted_by_others_soloing_at (mp)) {
-                                gain = Config->get_solo_mute_gain ();
-                        } else {
-                                gain = GAIN_COEFF_UNITY;
-                        }
-                }
-        }
-
-        return gain;
+	gain_t gain;
+
+	if (Config->get_solo_mute_override()) {
+		if (_soloed_by_self) {
+			gain = GAIN_COEFF_UNITY;
+		} else if (muted_by_self_at (mp) || muted_by_masters_at (mp)) {
+			gain = GAIN_COEFF_ZERO;
+		} else {
+			if (!_soloed_by_others && muted_by_others_soloing_at (mp)) {
+				gain = Config->get_solo_mute_gain ();
+			} else {
+				gain = GAIN_COEFF_UNITY;
+			}
+		}
+	} else {
+		if (muted_by_self_at (mp) || muted_by_masters_at (mp)) {
+			gain = GAIN_COEFF_ZERO;
+		} else if (_soloed_by_self || _soloed_by_others) {
+			gain = GAIN_COEFF_UNITY;
+		} else {
+			if (muted_by_others_soloing_at (mp)) {
+				gain = Config->get_solo_mute_gain ();
+			} else {
+				gain = GAIN_COEFF_UNITY;
+			}
+		}
+	}
+
+	return gain;
 }
 
 void
 MuteMaster::set_mute_points (const std::string& mute_point)
 {
-        MutePoint old = _mute_point;
+	MutePoint old = _mute_point;
 
 	_mute_point = (MutePoint) string_2_enum (mute_point, _mute_point);
 
-        if (old != _mute_point) {
-                MutePointChanged(); /* EMIT SIGNAL */
-        }
+	if (old != _mute_point) {
+		MutePointChanged(); /* EMIT SIGNAL */
+	}
 }
 
 void
 MuteMaster::set_mute_points (MutePoint mp)
 {
-        if (_mute_point != mp) {
-                _mute_point = mp;
-                MutePointChanged (); /* EMIT SIGNAL */
-        }
+	if (_mute_point != mp) {
+		_mute_point = mp;
+		MutePointChanged (); /* EMIT SIGNAL */
+	}
 }
 
 int