Mercurial > hg > xmms-sid

changeset 758:6c8c968595d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sanitize some #ifdefs.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 05 Nov 2012 19:05:16 +0200
parents 9c135d421676
children 693594421516
files src/xs_sidplay2.cc
diffstat 1 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/xs_sidplay2.cc	Mon Nov 05 19:03:27 2012 +0200
+++ b/src/xs_sidplay2.cc	Mon Nov 05 19:05:16 2012 +0200
@@ -197,24 +197,23 @@
 
 
     /* Audio parameters sanity checking and setup */
-#ifndef HAVE_SIDPLAY2_FP
-    engine->currConfig.precision = state->audioBitsPerSample;
-
-#else
+#ifdef HAVE_SIDPLAY2_FP
     state->audioBitsPerSample = XS_RES_16BIT;
     engine->currConfig.samplingMethod = SID2_RESAMPLE_INTERPOLATE;
+#else
+    engine->currConfig.precision = state->audioBitsPerSample;
 #endif
 
     engine->currConfig.frequency = state->audioFrequency;
 
 
     switch (state->audioBitsPerSample) {
+#ifndef HAVE_SIDPLAY2_FP
         case XS_RES_8BIT:
             state->audioFormat = FMT_U8;
-#ifndef HAVE_SIDPLAY2_FP
             engine->currConfig.sampleFormat = SID2_LITTLE_UNSIGNED;
+            break;
 #endif
-            break;
 
         case XS_RES_16BIT:
         default: