NO-OP: whitespace

2 files changed, 83 insertions, 83 deletions

diff --git a/libs/panners/stereobalance/panner_balance.cc b/libs/panners/stereobalance/panner_balance.cc
index 701f081951..4502bf1f09 100644
--- a/libs/panners/stereobalance/panner_balance.cc
+++ b/libs/panners/stereobalance/panner_balance.cc
@@ -19,35 +19,34 @@
 
 #include <inttypes.h>
 
-#include <cmath>
 #include <cerrno>
-#include <cstdlib>
-#include <string>
+#include <cmath>
 #include <cstdio>
+#include <cstdlib>
+#include <float.h>
 #include <locale.h>
+#include <string>
 #include <unistd.h>
-#include <float.h>
 
 #include <glibmm.h>
 
 #include "pbd/cartesian.h"
 #include "pbd/convert.h"
+#include "pbd/enumwriter.h"
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
 #include "pbd/xml++.h"
-#include "pbd/enumwriter.h"
 
 #include "evoral/Curve.h"
 
 #include "ardour/audio_buffer.h"
-#include "ardour/audio_buffer.h"
 #include "ardour/buffer_set.h"
+#include "ardour/mix.h"
 #include "ardour/pan_controllable.h"
 #include "ardour/pannable.h"
 #include "ardour/runtime_functions.h"
 #include "ardour/session.h"
 #include "ardour/utils.h"
-#include "ardour/mix.h"
 
 #include "panner_balance.h"
 
@@ -68,12 +67,16 @@ static PanPluginDescriptor _descriptor = {
 	Pannerbalance::factory
 };
 
-extern "C" ARDOURPANNER_API PanPluginDescriptor* panner_descriptor () { return &_descriptor; }
+extern "C" ARDOURPANNER_API PanPluginDescriptor*
+panner_descriptor ()
+{
+	return &_descriptor;
+}
 
 Pannerbalance::Pannerbalance (boost::shared_ptr<Pannable> p)
 	: Panner (p)
 {
-	if (!_pannable->has_state()) {
+	if (!_pannable->has_state ()) {
 		_pannable->pan_azimuth_control->set_value (0.5, Controllable::NoGroup);
 	}
 
@@ -96,10 +99,10 @@ Pannerbalance::~Pannerbalance ()
 double
 Pannerbalance::position () const
 {
-	return _pannable->pan_azimuth_control->get_value();
+	return _pannable->pan_azimuth_control->get_value ();
 }
 
-	void
+void
 Pannerbalance::set_position (double p)
 {
 	if (clamp_position (p)) {
@@ -107,7 +110,7 @@ Pannerbalance::set_position (double p)
 	}
 }
 
-	void
+void
 Pannerbalance::thaw ()
 {
 	Panner::thaw ();
@@ -123,7 +126,7 @@ Pannerbalance::update ()
 		return;
 	}
 
-	float const pos = _pannable->pan_azimuth_control->get_value();
+	float const pos = _pannable->pan_azimuth_control->get_value ();
 
 	if (pos == .5) {
 		desired_pos[0] = 1.0;
@@ -153,29 +156,29 @@ Pannerbalance::position_range () const
 void
 Pannerbalance::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, pframes_t nframes, uint32_t which)
 {
-	assert (obufs.count().n_audio() == 2);
+	assert (obufs.count ().n_audio () == 2);
 
-	pan_t delta;
+	pan_t   delta;
 	Sample* dst;
-	pan_t pan;
+	pan_t   pan;
 
-	Sample* const src = srcbuf.data();
+	Sample* const src = srcbuf.data ();
 
-	dst = obufs.get_audio(which).data();
+	dst = obufs.get_audio (which).data ();
 
 	if (fabsf ((delta = (pos[which] - desired_pos[which]))) > 0.002) { // about 1 degree of arc
 
 		/* we've moving the pan by an appreciable amount, so we must
-			 interpolate over 64 samples or nframes, whichever is smaller */
+		 * interpolate over 64 samples or nframes, whichever is smaller */
 
-		pframes_t const limit = min ((pframes_t) 64, nframes);
-		pframes_t n;
+		pframes_t const limit = min ((pframes_t)64, nframes);
+		pframes_t       n;
 
-		delta = -(delta / (float) (limit));
+		delta = -(delta / (float)(limit));
 
 		for (n = 0; n < limit; n++) {
 			pos_interp[which] = pos_interp[which] + delta;
-			pos[which] = pos_interp[which] + 0.9 * (pos[which] - pos_interp[which]);
+			pos[which]        = pos_interp[which] + 0.9 * (pos[which] - pos_interp[which]);
 			dst[n] += src[n] * pos[which] * gain_coeff;
 		}
 
@@ -183,31 +186,24 @@ Pannerbalance::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai
 
 		pan = pos[which] * gain_coeff;
 
-		mix_buffers_with_gain (dst+n,src+n,nframes-n,pan);
+		mix_buffers_with_gain (dst + n, src + n, nframes - n, pan);
 
 	} else {
-
-		pos[which] = desired_pos[which];
+		pos[which]        = desired_pos[which];
 		pos_interp[which] = pos[which];
 
 		if ((pan = (pos[which] * gain_coeff)) != 1.0f) {
-
 			if (pan != 0.0f) {
-
 				/* pan is 1 but also not 0, so we must do it "properly" */
 
-				//obufs.get_audio(1).read_from (srcbuf, nframes);
-				mix_buffers_with_gain(dst,src,nframes,pan);
-
-				/* mark that we wrote into the buffer */
-
-				// obufs[0] = 0;
+				mix_buffers_with_gain (dst, src, nframes, pan);
 
+				/* XXX it would be nice to mark the buffer as written to */
 			}
 
 		} else {
 			/* pan is 1 so we can just copy the input samples straight in */
-			mix_buffers_no_gain(dst,src,nframes);
+			mix_buffers_no_gain (dst, src, nframes);
 		}
 	}
 }
@@ -217,23 +213,22 @@ Pannerbalance::distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs,
                                          samplepos_t start, samplepos_t end, pframes_t nframes,
                                          pan_t** buffers, uint32_t which)
 {
-	assert (obufs.count().n_audio() == 2);
+	assert (obufs.count ().n_audio () == 2);
 
-	Sample* dst;
-	pan_t* pbuf;
-	Sample* const src = srcbuf.data();
-	pan_t* const position = buffers[0];
+	Sample*       dst;
+	pan_t*        pbuf;
+	Sample* const src      = srcbuf.data ();
+	pan_t* const  position = buffers[0];
 
 	/* fetch positional data */
 
-	if (!_pannable->pan_azimuth_control->list()->curve().rt_safe_get_vector (start, end, position, nframes)) {
+	if (!_pannable->pan_azimuth_control->list ()->curve ().rt_safe_get_vector (start, end, position, nframes)) {
 		/* fallback */
 		distribute_one (srcbuf, obufs, 1.0, nframes, which);
 		return;
 	}
 
 	for (pframes_t n = 0; n < nframes; ++n) {
-
 		float const pos = position[n];
 
 		if (which == 0) { // Left
@@ -251,7 +246,7 @@ Pannerbalance::distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs,
 		}
 	}
 
-	dst = obufs.get_audio(which).data();
+	dst  = obufs.get_audio (which).data ();
 	pbuf = buffers[which];
 
 	for (pframes_t n = 0; n < nframes; ++n) {
@@ -267,41 +262,40 @@ Pannerbalance::factory (boost::shared_ptr<Pannable> p, boost::shared_ptr<Speaker
 	return new Pannerbalance (p);
 }
 
-	XMLNode&
+XMLNode&
 Pannerbalance::get_state ()
 {
 	XMLNode& root (Panner::get_state ());
-	root.set_property (X_("uri"), _descriptor.panner_uri);
+	root.set_property (X_ ("uri"), _descriptor.panner_uri);
 	/* this is needed to allow new sessions to load with old Ardour: */
-	root.set_property (X_("type"), _descriptor.name);
+	root.set_property (X_ ("type"), _descriptor.name);
 	return root;
 }
 
 string
 Pannerbalance::value_as_string (boost::shared_ptr<const AutomationControl> ac) const
 {
-	/* DO NOT USE LocaleGuard HERE */
-	double val = ac->get_value();
+	double val = ac->get_value ();
 
-	switch (ac->parameter().type()) {
+	switch (ac->parameter ().type ()) {
 		case PanAzimuthAutomation:
 			/* We show the position of the center of the image relative to the left & right.
-				 This is expressed as a pair of percentage values that ranges from (100,0)
-				 (hard left) through (50,50) (hard center) to (0,100) (hard right).
-
-				 This is pretty wierd, but its the way audio engineers expect it. Just remember that
-				 the center of the USA isn't Kansas, its (50LA, 50NY) and it will all make sense.
-
-				 This is designed to be as narrow as possible. Dedicated
-				 panner GUIs can do their own version of this if they need
-				 something less compact.
-				 */
-
-			return string_compose (_("L%1R%2"), (int) rint (100.0 * (1.0 - val)),
-					(int) rint (100.0 * val));
+			 * This is expressed as a pair of percentage values that ranges from (100,0)
+			 * (hard left) through (50,50) (hard center) to (0,100) (hard right).
+			 *
+			 * This is pretty wierd, but its the way audio engineers expect it. Just remember that
+			 * the center of the USA isn't Kansas, its (50LA, 50NY) and it will all make sense.
+			 *
+			 * This is designed to be as narrow as possible. Dedicated
+			 * panner GUIs can do their own version of this if they need
+			 * something less compact.
+			 */
+
+			return string_compose (_ ("L%1R%2"), (int)rint (100.0 * (1.0 - val)),
+			                       (int)rint (100.0 * val));
 
 		default:
-			return _("unused");
+			return _ ("unused");
 	}
 }
 
diff --git a/libs/panners/stereobalance/panner_balance.h b/libs/panners/stereobalance/panner_balance.h
index 9ce5519759..b95a234a87 100644
--- a/libs/panners/stereobalance/panner_balance.h
+++ b/libs/panners/stereobalance/panner_balance.h
@@ -19,36 +19,42 @@
 #ifndef __ardour_panner_balance_h__
 #define __ardour_panner_balance_h__
 
-#include <cmath>
 #include <cassert>
-#include <vector>
-#include <string>
+#include <cmath>
 #include <iostream>
+#include <string>
+#include <vector>
 
-#include "pbd/stateful.h"
-#include "pbd/controllable.h"
 #include "pbd/cartesian.h"
+#include "pbd/controllable.h"
+#include "pbd/stateful.h"
 
-#include "ardour/automation_control.h"
 #include "ardour/automatable.h"
+#include "ardour/automation_control.h"
 #include "ardour/panner.h"
 #include "ardour/types.h"
 
-namespace ARDOUR {
-
+namespace ARDOUR
+{
 class Pannerbalance : public Panner
 {
-	public:
+public:
 	Pannerbalance (boost::shared_ptr<Pannable>);
 	~Pannerbalance ();
 
-	ChanCount in() const { return ChanCount (DataType::AUDIO, 2); }
-	ChanCount out() const { return ChanCount (DataType::AUDIO, 2); }
-
-	void set_position (double);
-	bool clamp_position (double&);
+	ChanCount in () const
+	{
+		return ChanCount (DataType::AUDIO, 2);
+	}
+	ChanCount out () const
+	{
+		return ChanCount (DataType::AUDIO, 2);
+	}
+
+	void                      set_position (double);
+	bool                      clamp_position (double&);
 	std::pair<double, double> position_range () const;
-	double position () const;
+	double                    position () const;
 
 	static Panner* factory (boost::shared_ptr<Pannable>, boost::shared_ptr<Speakers>);
 
@@ -59,20 +65,20 @@ class Pannerbalance : public Panner
 	void reset ();
 	void thaw ();
 
-	protected:
+protected:
 	float pos[2];
 	float desired_pos[2];
 	float pos_interp[2];
 
 	void update ();
 
-	private:
+private:
 	void distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, pframes_t nframes, uint32_t which);
 	void distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs,
-			samplepos_t start, samplepos_t end, pframes_t nframes,
-			pan_t** buffers, uint32_t which);
+	                               samplepos_t start, samplepos_t end, pframes_t nframes,
+	                               pan_t** buffers, uint32_t which);
 };
 
-} // namespace
+} // namespace ARDOUR
 
 #endif /* __ardour_panner_balance_h__ */