X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=9d0283d1137749e623daf2429fa77bd14b8a0fc9;hp=0d2566d7b480e13eba20320561562965d32690c1;hb=efc5ae3755deac971babf8aa7d3b80fd009c8f7b;hpb=620c2a3eb4c3395c5be73f663435740ecd878775 diff --git a/error.h b/error.h index 0d2566d7..9d0283d1 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,16 +59,11 @@ 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 MDCT_ERRORS \ +#define IMDCT_ERRORS \ PARA_ERROR(FFT_BAD_PARAMS, "invalid params for fft"), \ @@ -76,6 +83,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 \ @@ -209,6 +218,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 +241,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 \ @@ -287,6 +298,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 \ @@ -378,6 +390,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 \ @@ -395,6 +408,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 \