Merge branch 'master' into next

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 6881e692415ff5eb7a8641aef27bbb2baf14360e..5a5d015d4b2996c991909bee853d6cd3d8a0fd57 100644 (file)
--- 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
@@ -35,23 +34,64 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define AFS_COMMAND_LIST_ERRORS
 #define AUDIOD_COMMAND_LIST_ERRORS
 
+
 extern const char **para_errlist[];
 
+#define BUFFER_TREE_ERRORS \
+       PARA_ERROR(BTR_EOF, "buffer tree: end of file"), \
+       PARA_ERROR(BTR_NO_CHILD, "btr node has no children"), \
+
+#define STDOUT_ERRORS \
+       PARA_ERROR(STDOUT_EOF, "stdout: end of file"), \
+
+
+#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_BLOCK_SIZE, "invalid block size"), \
+       PARA_ERROR(INCOHERENT_BLOCK_LEN, "incoherent block length"), \
+       PARA_ERROR(WMADEC_EOF, "wmadec: end of file"), \
+
+
+#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 \
        PARA_ERROR(BAD_SAMPLE_FORMAT, "sample format not supported"), \
        PARA_ERROR(BAD_CHANNEL_COUNT, "channel count not supported"), \
        PARA_ERROR(BAD_SAMPLERATE, "sample rate not supported"), \
+       PARA_ERROR(OSS_EOF, "oss: end of file"), \
 
 
 #define COMPRESS_FILTER_ERRORS \
        PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \
+       PARA_ERROR(COMPRESS_EOF, "compress: end of file"), \
 
 
 #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 \
@@ -71,6 +111,8 @@ extern const char **para_errlist[];
 
 #define AMP_FILTER_ERRORS \
        PARA_ERROR(AMP_SYNTAX, "syntax error in amp filter config"), \
+       PARA_ERROR(AMP_ZERO_AMP, "no amplification necessary"), \
+       PARA_ERROR(AMP_EOF, "amp: end of file"), \
 
 
 #define SEND_COMMON_ERRORS \
@@ -250,6 +292,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 \
@@ -263,6 +306,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 \
@@ -354,6 +398,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 \
@@ -371,22 +416,24 @@ 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_EOF, "alsa: end of file"), \
 
 
 #define FILE_WRITE_ERRORS \
        PARA_ERROR(FW_WRITE, "file writer write error"), \
-       PARA_ERROR(FW_OPEN, "file writer: can not open output file"), \
        PARA_ERROR(FW_NO_FILE, "task started without open file"), \
 
 
 #define WRITE_COMMON_ERRORS \
        PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \
+       PARA_ERROR(WRITE_COMMON_EOF, "write: end of file"), \
 
 
 #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"), \
+       PARA_ERROR(AACDEC_EOF, "aacdec: end of file"), \
 
 
 #define CHUNK_QUEUE_ERRORS \