X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.h;h=8f74e236501189de420d1eec75a9a40b952b1707;hp=50c46eeecf740fe387f63e415781f31cd828de11;hb=481150224edabeee0a6bbfdab232df58e5c1224e;hpb=9609fd30e0d3db45ede3ab5c6bc3a77c15b6aef8 diff --git a/afh.h b/afh.h index 50c46eee..8f74e236 100644 --- a/afh.h +++ b/afh.h @@ -1,28 +1,11 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005-2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file afh.h structures for audio format handling (para_server) */ -/** \cond */ -#ifdef HAVE_OGGVORBIS -#define OV_AUDIO_FORMAT " ogg" -#else -#define OV_AUDIO_FORMAT "" -#endif - -#ifdef HAVE_FAAD -#define AAC_AUDIO_FORMAT " aac" -#else -#define AAC_AUDIO_FORMAT "" -#endif - -#define SUPPORTED_AUDIO_FORMATS "mp3 " OV_AUDIO_FORMAT AAC_AUDIO_FORMAT " wma " - -/** \endcond */ - /** * The tags used by all audio format handlers. * @@ -121,5 +104,4 @@ int compute_afhi(const char *path, char *data, size_t size, const char *audio_format_name(int); void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi, void *map, const char **buf, size_t *len); -uint32_t afh_get_largest_chunk_size(struct afh_info *afhi); void afh_get_header(struct afh_info *afhi, void *map, const char **buf, size_t *len);