[Jack-Devel] [PATCH 4/4] [alsa] fix whitespace from previous commits.

PrevNext  Index
DateTue, 15 Mar 2011 13:21:17 +0100
From Torben Hohn <[hidden] at gmx dot de>
To[hidden] at lists dot jackaudio dot org
In-Reply-ToTorben Hohn [Jack-Devel] [PATCH 1/4] [alsa] fix initialisation of io functions for capture only mode
---
 drivers/alsa/alsa_driver.c |  135 ++++++++++++++++++++++----------------------
 1 files changed, 67 insertions(+), 68 deletions(-)

diff --git a/drivers/alsa/alsa_driver.c b/drivers/alsa/alsa_driver.c
index ae26f42..6cc9cf7 100644
--- a/drivers/alsa/alsa_driver.c
+++ b/drivers/alsa/alsa_driver.c
@@ -234,85 +234,84 @@ static void
 alsa_driver_setup_io_function_pointers (alsa_driver_t *driver)
 {
 	if (driver->playback_handle) {
-	if (SND_PCM_FORMAT_FLOAT_LE == driver->playback_sample_format) {
-		driver->write_via_copy = sample_move_dS_floatLE;
-	} else {
-
-		switch (driver->playback_sample_bytes) {
-		case 2:
-			switch (driver->dither) {
-			case Rectangular:
-				jack_info("Rectangular dithering at 16 bits");
-				driver->write_via_copy = driver->quirk_bswap?
-                                        sample_move_dither_rect_d16_sSs:
-                                        sample_move_dither_rect_d16_sS;
+		if (SND_PCM_FORMAT_FLOAT_LE == driver->playback_sample_format) {
+			driver->write_via_copy = sample_move_dS_floatLE;
+		} else {
+			switch (driver->playback_sample_bytes) {
+			case 2:
+				switch (driver->dither) {
+				case Rectangular:
+					jack_info("Rectangular dithering at 16 bits");
+					driver->write_via_copy = driver->quirk_bswap?
+						sample_move_dither_rect_d16_sSs:
+						sample_move_dither_rect_d16_sS;
+					break;
+
+				case Triangular:
+					jack_info("Triangular dithering at 16 bits");
+					driver->write_via_copy = driver->quirk_bswap?
+						sample_move_dither_tri_d16_sSs:
+						sample_move_dither_tri_d16_sS;
+					break;
+
+				case Shaped:
+					jack_info("Noise-shaped dithering at 16 bits");
+					driver->write_via_copy = driver->quirk_bswap?
+						sample_move_dither_shaped_d16_sSs:
+						sample_move_dither_shaped_d16_sS;
+					break;
+
+				default:
+					driver->write_via_copy = driver->quirk_bswap?
+						sample_move_d16_sSs : 
+						sample_move_d16_sS;
+					break;
+				}
 				break;
-				
-			case Triangular:
-				jack_info("Triangular dithering at 16 bits");
+
+			case 3: /* NO DITHER */
 				driver->write_via_copy = driver->quirk_bswap?
-                                        sample_move_dither_tri_d16_sSs:
-                                        sample_move_dither_tri_d16_sS;
+					sample_move_d24_sSs: 
+					sample_move_d24_sS;
+
 				break;
-				
-			case Shaped:
-				jack_info("Noise-shaped dithering at 16 bits");
+
+			case 4: /* NO DITHER */
 				driver->write_via_copy = driver->quirk_bswap?
-                                        sample_move_dither_shaped_d16_sSs:
-                                        sample_move_dither_shaped_d16_sS;
+					sample_move_d32u24_sSs: 
+					sample_move_d32u24_sS;
 				break;
-				
+
 			default:
-				driver->write_via_copy = driver->quirk_bswap?
-                                        sample_move_d16_sSs : 
-        				sample_move_d16_sS;
-				break;
+				jack_error ("impossible sample width (%d) discovered!",
+						driver->playback_sample_bytes);
+				exit (1);
 			}
-			break;
-			
-		case 3: /* NO DITHER */
-			driver->write_via_copy = driver->quirk_bswap?
-				sample_move_d24_sSs: 
-				sample_move_d24_sS;
-
-			break;
-									
-	 	case 4: /* NO DITHER */
-			driver->write_via_copy = driver->quirk_bswap?
-				sample_move_d32u24_sSs: 
-				sample_move_d32u24_sS;
-		    break;
-
-		default:
-			jack_error ("impossible sample width (%d) discovered!",
-				    driver->playback_sample_bytes);
-			exit (1);
 		}
 	}
-	}
 	
 	if (driver->capture_handle) {
-	if (SND_PCM_FORMAT_FLOAT_LE == driver->capture_sample_format) {
-		driver->read_via_copy = sample_move_floatLE_sSs;
-	} else {
-	switch (driver->capture_sample_bytes) {
-	case 2:
-		driver->read_via_copy = driver->quirk_bswap?
-			sample_move_dS_s16s: 
-		        sample_move_dS_s16;
-		break;
-	case 3:
-		driver->read_via_copy = driver->quirk_bswap?
-			sample_move_dS_s24s: 
-		        sample_move_dS_s24;
-		break;
-	case 4:
-		driver->read_via_copy = driver->quirk_bswap?
-		 	sample_move_dS_s32u24s: 
-		        sample_move_dS_s32u24;
-		break;
-	}
-	}
+		if (SND_PCM_FORMAT_FLOAT_LE == driver->capture_sample_format) {
+			driver->read_via_copy = sample_move_floatLE_sSs;
+		} else {
+			switch (driver->capture_sample_bytes) {
+			case 2:
+				driver->read_via_copy = driver->quirk_bswap?
+					sample_move_dS_s16s: 
+					sample_move_dS_s16;
+				break;
+			case 3:
+				driver->read_via_copy = driver->quirk_bswap?
+					sample_move_dS_s24s: 
+					sample_move_dS_s24;
+				break;
+			case 4:
+				driver->read_via_copy = driver->quirk_bswap?
+					sample_move_dS_s32u24s: 
+					sample_move_dS_s32u24;
+				break;
+			}
+		}
 	}
 }
 
-- 
1.7.2.3
PrevNext  Index

1300191695.6174_0.ltw:2,a <1300191677-23161-4-git-send-email-torbenh at gmx dot de>