X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_common.c;h=0d54eea132d8b91973e01971ab945411865ca2bc;hp=7ecab4e47a9bd7e47bcc7e378043d62d663cf343;hb=1cefe6a503c74d609db4e99e689d46575a5e40fd;hpb=0e3764a52eb6af123414ce07bcceb2c8bd2836c1 diff --git a/afh_common.c b/afh_common.c index 7ecab4e4..0d54eea1 100644 --- a/afh_common.c +++ b/afh_common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2011 Andre Noll + * Copyright (C) 1997-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -9,7 +9,6 @@ #include /* mmap */ #include /* gettimeofday */ #include -#include #include #include "para.h" @@ -29,6 +28,9 @@ void mp3_init(struct audio_format_handler *); #ifdef HAVE_SPEEX void spx_afh_init(struct audio_format_handler *); #endif +#ifdef HAVE_FLAC + void flac_afh_init(struct audio_format_handler *); +#endif void wma_afh_init(struct audio_format_handler *); /** @@ -68,6 +70,12 @@ static struct audio_format_handler afl[] = { .name = "spx", #ifdef HAVE_SPEEX .init = spx_afh_init, +#endif + }, + { + .name = "flac", +#ifdef HAVE_FLAC + .init = flac_afh_init, #endif }, { @@ -214,7 +222,7 @@ success: * * \param i The audio format number. * - * This returns a pointer to statically allocated memory so it + * \return This returns a pointer to statically allocated memory so it * must not be freed by the caller. */ const char *audio_format_name(int i)