Fix more broken indentation (whitespace changes only).

git-svn-id: svn://localhost/ardour2/branches/3.0@8094 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 106 insertions, 107 deletions

diff --git a/libs/pbd/cartesian.cc b/libs/pbd/cartesian.cc
index 8bece8e005..c09e00b189 100644
--- a/libs/pbd/cartesian.cc
+++ b/libs/pbd/cartesian.cc
@@ -26,56 +26,56 @@ using namespace std;
 void
 PBD::azi_ele_to_cart (double azi, double ele, double& x, double& y, double& z)
 {
-        /* convert from cylindrical coordinates in degrees to cartesian */
+	/* convert from cylindrical coordinates in degrees to cartesian */
 
-        static const double atorad = 2.0 * M_PI / 360.0 ;
+	static const double atorad = 2.0 * M_PI / 360.0 ;
 
-        x = cos (azi * atorad) * cos (ele * atorad);
-        y = sin (azi * atorad) * cos (ele * atorad);
-        z = sin (ele * atorad);
+	x = cos (azi * atorad) * cos (ele * atorad);
+	y = sin (azi * atorad) * cos (ele * atorad);
+	z = sin (ele * atorad);
 }
 
 void 
 PBD::cart_to_azi_ele (double x, double y, double z, double& azimuth, double& elevation)
 {
-        /* converts cartesian coordinates to cylindrical in degrees*/
-
-        const double atorad = 2.0 * M_PI / 360.0;
-        double atan_y_per_x, atan_x_pl_y_per_z;
-        double distance;
-
-        if(x == 0.0) {
-                atan_y_per_x = M_PI / 2;
-        } else {
-                atan_y_per_x = atan2 (y,x);
-        }
-
-        if (y < 0.0) {
-                /* below x-axis: atan2 returns 0 .. -PI (negative) so convert to degrees and ADD to 180 */
-                azimuth = 180.0 + (atan_y_per_x / (M_PI/180.0) + 180.0);
-        } else {
-                /* above x-axis: atan2 returns 0 .. +PI so convert to degrees */
-                azimuth = atan_y_per_x / atorad;
-        }
-
-        distance = sqrt (x*x + y*y);
-
-        if (z == 0.0) {
-                atan_x_pl_y_per_z = 0.0;
-        } else {
-                atan_x_pl_y_per_z = atan2 (z,distance);
-        }
-
-        if (distance == 0.0) {
-                if (z < 0.0) {
-                        atan_x_pl_y_per_z = -M_PI/2.0;
-                } else if (z > 0.0) {
-                        atan_x_pl_y_per_z = M_PI/2.0;
-                }
-        }
-
-        elevation = atan_x_pl_y_per_z / atorad;
-
-        // distance = sqrtf (x*x + y*y + z*z);
+	/* converts cartesian coordinates to cylindrical in degrees*/
+
+	const double atorad = 2.0 * M_PI / 360.0;
+	double atan_y_per_x, atan_x_pl_y_per_z;
+	double distance;
+
+	if (x == 0.0) {
+		atan_y_per_x = M_PI / 2;
+	} else {
+		atan_y_per_x = atan2 (y,x);
+	}
+
+	if (y < 0.0) {
+		/* below x-axis: atan2 returns 0 .. -PI (negative) so convert to degrees and ADD to 180 */
+		azimuth = 180.0 + (atan_y_per_x / (M_PI/180.0) + 180.0);
+	} else {
+		/* above x-axis: atan2 returns 0 .. +PI so convert to degrees */
+		azimuth = atan_y_per_x / atorad;
+	}
+
+	distance = sqrt (x*x + y*y);
+
+	if (z == 0.0) {
+		atan_x_pl_y_per_z = 0.0;
+	} else {
+		atan_x_pl_y_per_z = atan2 (z,distance);
+	}
+
+	if (distance == 0.0) {
+		if (z < 0.0) {
+			atan_x_pl_y_per_z = -M_PI/2.0;
+		} else if (z > 0.0) {
+			atan_x_pl_y_per_z = M_PI/2.0;
+		}
+	}
+
+	elevation = atan_x_pl_y_per_z / atorad;
+
+	// distance = sqrtf (x*x + y*y + z*z);
 }
 
diff --git a/libs/pbd/pbd/cartesian.h b/libs/pbd/pbd/cartesian.h
index b44a12cd3d..afa4579465 100644
--- a/libs/pbd/pbd/cartesian.h
+++ b/libs/pbd/pbd/cartesian.h
@@ -30,74 +30,73 @@ void cart_to_azi_ele (double x, double y, double z, double& azi, double& ele);
 struct AngularVector;
 
 struct CartesianVector {
-    double x;
-    double y;
-    double z;
-
-    CartesianVector () : x(0.0), y(0.0), z(0.0) {}
-    CartesianVector (double xp, double yp, double zp = 0.0) : x(xp), y(yp), z(zp) {}
-
-    CartesianVector& translate (CartesianVector& other, double xtranslate, double ytranslate, double ztranslate = 0.0) {
-            other.x += xtranslate;
-            other.y += ytranslate;
-            other.z += ztranslate;
-            return other;
-    }
-
-    CartesianVector& scale (CartesianVector& other, double xscale, double yscale, double zscale = 1.0) {
-            other.x *= xscale;
-            other.y *= yscale;
-            other.z *= zscale;
-            return other;
-    }
-
-    void angular (AngularVector&) const;
+	double x;
+	double y;
+	double z;
+
+	CartesianVector () : x(0.0), y(0.0), z(0.0) {}
+	CartesianVector (double xp, double yp, double zp = 0.0) : x(xp), y(yp), z(zp) {}
+
+	CartesianVector& translate (CartesianVector& other, double xtranslate, double ytranslate, double ztranslate = 0.0) {
+		other.x += xtranslate;
+		other.y += ytranslate;
+		other.z += ztranslate;
+		return other;
+	}
+
+	CartesianVector& scale (CartesianVector& other, double xscale, double yscale, double zscale = 1.0) {
+		other.x *= xscale;
+		other.y *= yscale;
+		other.z *= zscale;
+		return other;
+	}
+
+	void angular (AngularVector&) const;
 };
 
 struct AngularVector {
-    double azi;
-    double ele;
-    double length;
-
-    AngularVector () : azi(0.0), ele(0.0), length (0.0) {}
-    AngularVector (double a, double e, double l = 1.0) : azi(a), ele(e), length (l) {}
-
-    AngularVector operator- (const AngularVector& other) const {
-            AngularVector r;
-            r.azi = azi - other.azi;
-            r.ele = ele - other.ele;
-            r.length = length - other.length;
-            return r;
-    }
-
-    AngularVector operator+ (const AngularVector& other) const {
-            AngularVector r;
-            r.azi = azi + other.azi;
-            r.ele = ele + other.ele;
-            r.length = length + other.length;
-            return r;
-    }
-
-    bool operator== (const AngularVector& other) const {
-            return fabs (azi - other.azi) <= FLT_EPSILON &&
-                    fabs (ele - other.ele) <= FLT_EPSILON &&
-                    fabs (length - other.length) <= FLT_EPSILON;
-    }
-
-    bool operator!= (const AngularVector& other) const {
-            return fabs (azi - other.azi) > FLT_EPSILON ||
-                    fabs (ele - other.ele) > FLT_EPSILON ||
-                    fabs (length - other.length) > FLT_EPSILON;
-    }
-
-    void cartesian (CartesianVector& c) const {
-            azi_ele_to_cart (azi, ele, c.x, c.y, c.z);
-    }
+	double azi;
+	double ele;
+	double length;
+
+	AngularVector () : azi(0.0), ele(0.0), length (0.0) {}
+	AngularVector (double a, double e, double l = 1.0) : azi(a), ele(e), length (l) {}
+
+	AngularVector operator- (const AngularVector& other) const {
+		AngularVector r;
+		r.azi = azi - other.azi;
+		r.ele = ele - other.ele;
+		r.length = length - other.length;
+		return r;
+	}
+
+	AngularVector operator+ (const AngularVector& other) const {
+		AngularVector r;
+		r.azi = azi + other.azi;
+		r.ele = ele + other.ele;
+		r.length = length + other.length;
+		return r;
+	}
+
+	bool operator== (const AngularVector& other) const {
+		return fabs (azi - other.azi) <= FLT_EPSILON &&
+		fabs (ele - other.ele) <= FLT_EPSILON &&
+		fabs (length - other.length) <= FLT_EPSILON;
+	}
+
+	bool operator!= (const AngularVector& other) const {
+		return fabs (azi - other.azi) > FLT_EPSILON ||
+			fabs (ele - other.ele) > FLT_EPSILON ||
+			fabs (length - other.length) > FLT_EPSILON;
+	}
+
+	void cartesian (CartesianVector& c) const {
+		azi_ele_to_cart (azi, ele, c.x, c.y, c.z);
+	}
 };
 
-inline
-void CartesianVector::angular (AngularVector& a) const {
-        cart_to_azi_ele (x, y, z, a.azi, a.ele);
+inline void CartesianVector::angular (AngularVector& a) const {
+	cart_to_azi_ele (x, y, z, a.azi, a.ele);
 }
 
 }