X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=f5fdea64ccc6f172f91061f605304bb2b5d75b11;hp=33d09f28c9e6530c6c44de32d6dbd6e6f2ec59f1;hb=c6675d53d29b87bf0ac4c713edbaae630611048e;hpb=f481eaddec671c3783cc098d65be29ea16ee81b1 diff --git a/error.h b/error.h index 33d09f28..f5fdea64 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,10 +33,23 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define SERVER_COMMAND_LIST_ERRORS #define AFS_COMMAND_LIST_ERRORS #define AUDIOD_COMMAND_LIST_ERRORS -#define WMA_AFH_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"), \ @@ -47,15 +59,10 @@ extern const char **para_errlist[]; 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"), \ -#define BITSTREAM_ERRORS \ - PARA_ERROR(TABLE_ALLOC, "failed to allocate table"), \ - PARA_ERROR(BAD_CODES, "detected incorrect codes") - - #define IMDCT_ERRORS \ PARA_ERROR(FFT_BAD_PARAMS, "invalid params for fft"), \ @@ -209,6 +216,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"), \ @@ -231,6 +239,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 \ @@ -395,6 +404,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 \