# HG changeset patch # User reimar # Date 1105017353 0 # Node ID d862ff28281565d52f61460fe0a2e00346cde760 # Parent 0a22a046f0d31764cc1dea6d4d59ed6f0a9f29ae Check for every 24 and 32 bit AFMT_ separately if it is defined. Patch by Walter Haidinger walter dot haidinger at gmx dot at diff -r 0a22a046f0d3 -r d862ff282815 libao2/ao_oss.c --- a/libao2/ao_oss.c Thu Jan 06 13:14:30 2005 +0000 +++ b/libao2/ao_oss.c Thu Jan 06 13:15:53 2005 +0000 @@ -50,16 +50,28 @@ case AF_FORMAT_U16_BE: return AFMT_U16_BE; case AF_FORMAT_S16_LE: return AFMT_S16_LE; case AF_FORMAT_S16_BE: return AFMT_S16_BE; -#ifdef AFMT_S24_LE +#ifdef AFMT_U24_LE case AF_FORMAT_U24_LE: return AFMT_U24_LE; +#endif +#ifdef AFMT_U24_BE case AF_FORMAT_U24_BE: return AFMT_U24_BE; +#endif +#ifdef AFMT_S24_LE case AF_FORMAT_S24_LE: return AFMT_S24_LE; +#endif +#ifdef AFMT_S24_BE case AF_FORMAT_S24_BE: return AFMT_S24_BE; #endif -#ifdef AFMT_S32_LE +#ifdef AFMT_U32_LE case AF_FORMAT_U32_LE: return AFMT_U32_LE; +#endif +#ifdef AFMT_U32_BE case AF_FORMAT_U32_BE: return AFMT_U32_BE; +#endif +#ifdef AFMT_S32_LE case AF_FORMAT_S32_LE: return AFMT_S32_LE; +#endif +#ifdef AFMT_S32_BE case AF_FORMAT_S32_BE: return AFMT_S32_BE; #endif #ifdef AFMT_FLOAT @@ -90,16 +102,28 @@ case AFMT_U16_BE: return AF_FORMAT_U16_BE; case AFMT_S16_LE: return AF_FORMAT_S16_LE; case AFMT_S16_BE: return AF_FORMAT_S16_BE; -#ifdef AFMT_S24_LE +#ifdef AFMT_U24_LE case AFMT_U24_LE: return AF_FORMAT_U24_LE; +#endif +#ifdef AFMT_U24_BE case AFMT_U24_BE: return AF_FORMAT_U24_BE; +#endif +#ifdef AFMT_S24_LE case AFMT_S24_LE: return AF_FORMAT_S24_LE; +#endif +#ifdef AFMT_S24_BE case AFMT_S24_BE: return AF_FORMAT_S24_BE; #endif -#ifdef AFMT_S32_LE +#ifdef AFMT_U32_LE case AFMT_U32_LE: return AF_FORMAT_U32_LE; +#endif +#ifdef AFMT_U32_BE case AFMT_U32_BE: return AF_FORMAT_U32_BE; +#endif +#ifdef AFMT_S32_LE case AFMT_S32_LE: return AF_FORMAT_S32_LE; +#endif +#ifdef AFMT_S32_BE case AFMT_S32_BE: return AF_FORMAT_S32_BE; #endif #ifdef AFMT_FLOAT