X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=89910a47cd028c0eeb851b428bf08afca928e8b2;hp=cacc83e9c26d79d59f4a66505c9bfd278b8ff2f0;hb=47a19b175dd1f39a878c948ae56a0d7054da20cc;hpb=89a0e510df07bc7210ca9e73381763fdd183df75 diff --git a/error.h b/error.h index cacc83e9..89910a47 100644 --- a/error.h +++ b/error.h @@ -13,7 +13,7 @@ DEFINE_ERRLIST_OBJECT_ENUM; /* these do not need error handling (yet) */ #define SERVER_ERRORS -#define WAV_ERRORS +#define WAV_FILTER_ERRORS #define TIME_ERRORS #define CLOSE_ON_FORK_ERRORS #define DAEMON_ERRORS @@ -32,7 +32,7 @@ DEFINE_ERRLIST_OBJECT_ENUM; extern const char **para_errlist[]; -#define COMPRESS_ERRORS \ +#define COMPRESS_FILTER_ERRORS \ PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \ @@ -240,7 +240,7 @@ extern const char **para_errlist[]; PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \ -#define FILTER_CHAIN_ERRORS \ +#define FILTER_COMMON_ERRORS \ PARA_ERROR(UNSUPPORTED_FILTER, "given filter not supported"), \ PARA_ERROR(BAD_FILTER_OPTIONS, "invalid filter option given"), \ PARA_ERROR(FC_EOF, "filter chain: eof"), \ @@ -251,7 +251,7 @@ extern const char **para_errlist[]; PARA_ERROR(UNKNOWN_STAT_ITEM, "status item not recognized"), \ -#define OGGDEC_ERRORS \ +#define OGGDEC_FILTER_ERRORS \ PARA_ERROR(OGGDEC_READ, "read from media returned an error"), \ PARA_ERROR(OGGDEC_NOTVORBIS, "bitstream is not vorbis data"), \ PARA_ERROR(OGGDEC_VERSION, "vorbis version mismatch"), \ @@ -271,9 +271,10 @@ extern const char **para_errlist[]; PARA_ERROR(GC_VERSION_GIVEN, ""), /* not really an error */ \ -#define MP3DEC_ERRORS \ +#define MP3DEC_FILTER_ERRORS \ PARA_ERROR(MAD_FRAME_DECODE, "mad frame decode error"), \ PARA_ERROR(MP3DEC_OVERRUN, "mp3 output buffer overrun"), \ + PARA_ERROR(MP3DEC_SYNTAX, "syntax error in mp3dec config"), \ #define FILTER_ERRORS \ @@ -398,7 +399,7 @@ extern const char **para_errlist[]; PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \ -#define AACDEC_ERRORS \ +#define AACDEC_FILTER_ERRORS \ PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \ PARA_ERROR(AAC_DECODE, "aac decode error"), \ PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \