Merge branch 'master' into next

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 08d6bd6e13da2ba04c9b2caa1f99f413887837ef..5a5d015d4b2996c991909bee853d6cd3d8a0fd57 100644 (file)
--- a/error.h
+++ b/error.h
@@ -33,13 +33,16 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define SERVER_COMMAND_LIST_ERRORS
 #define AFS_COMMAND_LIST_ERRORS
 #define AUDIOD_COMMAND_LIST_ERRORS
-#define BUFFER_TREE_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(ORPHAN, "orphaned (EOF)"), \
+       PARA_ERROR(STDOUT_EOF, "stdout: end of file"), \
 
 
 #define BITSTREAM_ERRORS \
@@ -77,10 +80,12 @@ extern const char **para_errlist[];
        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 \
@@ -107,6 +112,7 @@ 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 \
@@ -221,7 +227,6 @@ 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"), \
 
 
 
@@ -244,7 +249,6 @@ 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 \
@@ -412,12 +416,11 @@ 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"), \
+       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"), \