Changeset 2847:403396142808 in roaraudio

Timestamp:

10/04/09 01:33:30 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

a bit cleanup of code

File:

• roarclients/roarfilt.c (modified) (1 diff)

roarclients/roarfilt.c

@@ -247 +247 @@
  }
 
- if ( bits == 16 ) {
-  while((i = roar_vio_read(&svio, buf, BUFSIZE))) {
-   if ( mul != div )
-    vol2((void*)buf, mul, div, i);
-#ifdef ROAR_HAVE_LIBM
-   if ( logscale )
-    logs2((void*)buf, logscale, i);
-   if ( g_lowpass.a )
-    lowpass2((void*)buf, i, channels);
-#endif
-   roardsp_fchain_calc(&fc, (void*)buf, (8*i)/bits);
-   if (roar_vio_write(&svio, buf, i) != i)
-    break;
-  }
- } else if ( bits == 8 ) {
-  while((i = roar_vio_read(&svio, buf, BUFSIZE))) {
-   vol1((void*)buf, mul, div, i);
-   if (roar_vio_write(&svio, buf, i) != i)
-    break;
-  }
- } else {
-  fprintf(stderr, "Error: %i bits per sample is not supported!\n", bits);
-  return 1;
+ switch (bits) {
+  case 16:
+    while((i = roar_vio_read(&svio, buf, BUFSIZE))) {
+     if ( mul != div )
+      vol2((void*)buf, mul, div, i);
+#ifdef ROAR_HAVE_LIBM
+     if ( logscale )
+      logs2((void*)buf, logscale, i);
+     if ( g_lowpass.a )
+      lowpass2((void*)buf, i, channels);
+#endif
+     roardsp_fchain_calc(&fc, (void*)buf, (8*i)/bits);
+     if (roar_vio_write(&svio, buf, i) != i)
+      break;
+    }
+   break;
+  case 8:
+    while((i = roar_vio_read(&svio, buf, BUFSIZE))) {
+     vol1((void*)buf, mul, div, i);
+     if (roar_vio_write(&svio, buf, i) != i)
+      break;
+    }
+   break;
+  default:
+    fprintf(stderr, "Error: %i bits per sample is not supported!\n", bits);
+    return 1;
  }