X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=fd0213b21ced5874c35f2b6ef2735cab4baabfbd;hp=7553699c534300c907d2989135fe1c8ff5d88cfa;hb=05492521d51352fa8c4f55b71b33e14656f0bd0d;hpb=226ce82aaccff7e74a6fadd028743b731a3744d2 diff --git a/error.h b/error.h index 7553699c..fd0213b2 100644 --- a/error.h +++ b/error.h @@ -23,7 +23,6 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define SHA1_ERRORS #define RBTREE_ERRORS #define RECV_ERRORS -#define STDOUT_ERRORS #define IPC_ERRORS #define DCCP_SEND_ERRORS #define HTTP_SEND_ERRORS @@ -34,30 +33,44 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define SERVER_COMMAND_LIST_ERRORS #define AFS_COMMAND_LIST_ERRORS #define AUDIOD_COMMAND_LIST_ERRORS -#define WMA_AFH_ERRORS -#define WMA_COMMON_ERRORS +#define BUFFER_TREE_ERRORS + extern const char **para_errlist[]; +#define STDOUT_ERRORS \ + PARA_ERROR(ORPHAN, "orphaned (EOF)"), \ + + +#define BITSTREAM_ERRORS \ + PARA_ERROR(VLC, "invalid vlc code"), \ + + +#define WMA_AFH_ERRORS \ + PARA_ERROR(NO_WMA, "asf/wma format not recognized"), \ + + +#define WMA_COMMON_ERRORS \ + PARA_ERROR(WMA_NO_GUID, "audio stream guid not found"), \ + PARA_ERROR(WMA_BAD_ASF_HEADER, "invalid asf header"), \ + + #define WMADEC_FILTER_ERRORS \ PARA_ERROR(WMA_BAD_PARAMS, "invalid WMA parameters"), \ PARA_ERROR(WMA_OUTPUT_SPACE, "insufficient output space"), \ PARA_ERROR(WMA_BAD_SUPERFRAME, "invalid superframe"), \ - PARA_ERROR(WMA_DECODE, "wma decode error"), \ + PARA_ERROR(WMA_BLOCK_SIZE, "invalid block size"), \ PARA_ERROR(INCOHERENT_BLOCK_LEN, "incoherent block length"), \ + PARA_ERROR(WMADEC_EOF, "wmadec: end of file"), \ -#define BITSTREAM_ERRORS \ - PARA_ERROR(TABLE_ALLOC, "failed to allocate table"), \ - PARA_ERROR(BAD_CODES, "detected incorrect codes") - - -#define MDCT_ERRORS \ +#define IMDCT_ERRORS \ PARA_ERROR(FFT_BAD_PARAMS, "invalid params for fft"), \ #define PREBUFFER_FILTER_ERRORS \ PARA_ERROR(PREBUFFER_SYNTAX, "syntax error in prebuffer filter config"), \ + PARA_ERROR(PREBUFFER_SUCCESS, "prebuffering complete"), \ #define OSS_WRITE_ERRORS \ @@ -72,6 +85,8 @@ extern const char **para_errlist[]; #define WAV_FILTER_ERRORS \ PARA_ERROR(WAV_BAD_FC, "invalid filter chain configuration"), \ + PARA_ERROR(WAV_EOF, "wav filter: end of file"), \ + PARA_ERROR(WAV_SUCCESS, "successfully wrote wav header"), \ #define FEC_ERRORS \ @@ -205,6 +220,7 @@ extern const char **para_errlist[]; #define STDIN_ERRORS \ PARA_ERROR(STDIN_EOF, "end of file"), \ + PARA_ERROR(STDIN_NO_CHILD, "stdin btr node has no children"), \ @@ -227,6 +243,7 @@ extern const char **para_errlist[]; #define HTTP_RECV_ERRORS \ PARA_ERROR(HTTP_RECV_OVERRUN, "http_recv: output buffer overrun"), \ + PARA_ERROR(HTTP_RECV_NO_CHILD, "http_recv btr node has no children"), \ #define RECV_COMMON_ERRORS \ @@ -270,6 +287,7 @@ extern const char **para_errlist[]; PARA_ERROR(OGGDEC_FAULT, "bug or heap/stack corruption"), \ PARA_ERROR(OGGDEC_BADLINK, "invalid stream section or requested link corrupt"), \ PARA_ERROR(OGGDEC_SYNTAX, "syntax error in oggdec config"), \ + PARA_ERROR(OGGDEC_EOF, "oggdec: end of file"), \ #define GRAB_CLIENT_ERRORS \ @@ -283,6 +301,7 @@ extern const char **para_errlist[]; 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"), \ + PARA_ERROR(MP3DEC_EOF, "mp3dec: end of file"), \ #define FILTER_ERRORS \ @@ -374,6 +393,7 @@ extern const char **para_errlist[]; PARA_ERROR(WAV_HEADER_SUCCESS, "successfully read wave header"), \ PARA_ERROR(NO_DELAY, "no initial delay"), \ PARA_ERROR(DELAY_TIMEOUT, "initial delay timeout"), \ + PARA_ERROR(WRITE_EOF, "end of file"), \ #define ALSA_WRITE_ERRORS \ @@ -391,6 +411,7 @@ extern const char **para_errlist[]; PARA_ERROR(SET_RATE, "snd_pcm_hw_params_set_rate_near failed"), \ PARA_ERROR(START_THRESHOLD, "snd_pcm_sw_params_set_start_threshold() failed"), \ PARA_ERROR(STOP_THRESHOLD, "snd_pcm_sw_params_set_stop_threshold() failed"), \ + PARA_ERROR(ALSA_ORPHAN, "alsa btr node has no parent"), \ #define FILE_WRITE_ERRORS \ @@ -407,6 +428,7 @@ extern const char **para_errlist[]; PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \ PARA_ERROR(AAC_DECODE, "aac decode error"), \ PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \ + PARA_ERROR(AACDEC_EOF, "aacdec: end of file"), \ #define CHUNK_QUEUE_ERRORS \