# HG changeset patch # User Matti Hamalainen # Date 1352135116 -7200 # Node ID 6c8c968595d9dc3e40b9ad9de8339f4d8ccfc32b # Parent 9c135d421676accc97becc9342e94c18f5e0faef Sanitize some #ifdefs. diff -r 9c135d421676 -r 6c8c968595d9 src/xs_sidplay2.cc --- 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: