Fix mixed space/tab evil in globals.cc for no particular reason.

git-svn-id: svn://localhost/ardour2/trunk@2573 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 37 insertions, 37 deletions

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index c3eae5ad86..badd13412e 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -89,11 +89,11 @@ Change ARDOUR::PositionChanged = ARDOUR::new_change ();
 Change ARDOUR::NameChanged = ARDOUR::new_change ();
 Change ARDOUR::BoundsChanged = Change (0); // see init(), below
 
-compute_peak_t			ARDOUR::compute_peak 		= 0;
-find_peaks_t			ARDOUR::find_peaks 		= 0;
-apply_gain_to_buffer_t		ARDOUR::apply_gain_to_buffer 	= 0;
-mix_buffers_with_gain_t	        ARDOUR::mix_buffers_with_gain 	= 0;
-mix_buffers_no_gain_t		ARDOUR::mix_buffers_no_gain 	= 0;
+compute_peak_t          ARDOUR::compute_peak = 0;
+find_peaks_t            ARDOUR::find_peaks = 0;
+apply_gain_to_buffer_t  ARDOUR::apply_gain_to_buffer = 0;
+mix_buffers_with_gain_t ARDOUR::mix_buffers_with_gain = 0;
+mix_buffers_no_gain_t   ARDOUR::mix_buffers_no_gain = 0;
 
 #ifdef HAVE_LIBLO
 static int
@@ -193,61 +193,61 @@ setup_midi ()
 void
 setup_hardware_optimization (bool try_optimization)
 {
-        bool generic_mix_functions = true;
+	bool generic_mix_functions = true;
 
 	if (try_optimization) {
 
 		FPU fpu;
 
 #if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS)
-		
+
 		if (fpu.has_sse()) {
 
 			info << "Using SSE optimized routines" << endmsg;
-	
+
 			// SSE SET
-			compute_peak 		= x86_sse_compute_peak;
-			find_peaks 		= x86_sse_find_peaks;
-			apply_gain_to_buffer 	= x86_sse_apply_gain_to_buffer;
-			mix_buffers_with_gain 	= x86_sse_mix_buffers_with_gain;
-			mix_buffers_no_gain 	= x86_sse_mix_buffers_no_gain;
+			compute_peak          = x86_sse_compute_peak;
+			find_peaks            = x86_sse_find_peaks;
+			apply_gain_to_buffer  = x86_sse_apply_gain_to_buffer;
+			mix_buffers_with_gain = x86_sse_mix_buffers_with_gain;
+			mix_buffers_no_gain   = x86_sse_mix_buffers_no_gain;
 
 			generic_mix_functions = false;
 
-                }
+		}
 
 #elif defined (__APPLE__) && defined (BUILD_VECLIB_OPTIMIZATIONS)
-                long sysVersion = 0;
+		long sysVersion = 0;
 
-                if (noErr != Gestalt(gestaltSystemVersion, &sysVersion))
-                        sysVersion = 0;
+		if (noErr != Gestalt(gestaltSystemVersion, &sysVersion))
+			sysVersion = 0;
 
-                if (sysVersion >= 0x00001040) { // Tiger at least
-                        compute_peak           = veclib_compute_peak;
-			find_peaks 	       = veclib_find_peaks;
-                        apply_gain_to_buffer   = veclib_apply_gain_to_buffer;
-                        mix_buffers_with_gain  = veclib_mix_buffers_with_gain;
-                        mix_buffers_no_gain    = veclib_mix_buffers_no_gain;
+		if (sysVersion >= 0x00001040) { // Tiger at least
+			compute_peak           = veclib_compute_peak;
+			find_peaks             = veclib_find_peaks;
+			apply_gain_to_buffer   = veclib_apply_gain_to_buffer;
+			mix_buffers_with_gain  = veclib_mix_buffers_with_gain;
+			mix_buffers_no_gain    = veclib_mix_buffers_no_gain;
 
-                        generic_mix_functions = false;
+			generic_mix_functions = false;
 
-                        info << "Apple VecLib H/W specific optimizations in use" << endmsg;
-                }
+			info << "Apple VecLib H/W specific optimizations in use" << endmsg;
+		}
 #endif
-		
+
 		/* consider FPU denormal handling to be "h/w optimization" */
-		
+
 		setup_fpu ();
-        }
+	}
+
+	if (generic_mix_functions) {
+
+		compute_peak          = default_compute_peak;
+		find_peaks            = default_find_peaks;
+		apply_gain_to_buffer  = default_apply_gain_to_buffer;
+		mix_buffers_with_gain = default_mix_buffers_with_gain;
+		mix_buffers_no_gain   = default_mix_buffers_no_gain;
 
-        if (generic_mix_functions) {
-		
-		compute_peak 		= default_compute_peak;
-		find_peaks 		= default_find_peaks;
-		apply_gain_to_buffer 	= default_apply_gain_to_buffer;
-		mix_buffers_with_gain 	= default_mix_buffers_with_gain;
-		mix_buffers_no_gain 	= default_mix_buffers_no_gain;
-		
 		info << "No H/W specific optimizations in use" << endmsg;
 	}
 }