X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=8458ae2bb1b7dea13c242949bb2b8763d1213ef2;hp=a53531b7fbf4f29bbd67474b17e2d1778b410b9a;hb=899a19c03fc05f6fd98687e3eaa86841a4633a10;hpb=148c7c722fd5795228f586b6ef8d953662b68224

diff --git a/error.h b/error.h
index a53531b7..8458ae2b 100644
--- a/error.h
+++ b/error.h
@@ -20,6 +20,7 @@
 
 /** \cond list of all subsystems that support the shiny error facility */
 enum para_subsystem {
+	SS_SCHED,
 	SS_GUI,
 	SS_TIME,
 	SS_WAV,
@@ -33,8 +34,8 @@ enum para_subsystem {
 	SS_ORTP_RECV,
 	SS_AUDIOD,
 	SS_EXEC,
-	SS_SCHED,
 	SS_STDIN,
+	SS_STDOUT,
 	SS_SIGNAL,
 	SS_STRING,
 	SS_STAT,
@@ -81,6 +82,7 @@ enum para_subsystem {
 #define ORTP_SEND_ERRORS
 #define GUI_ERRORS
 #define RINGBUFFER_ERRORS
+#define SCHED_ERRORS
 
 
 extern const char **para_errlist[];
@@ -91,11 +93,9 @@ extern const char **para_errlist[];
 	PARA_ERROR(STDIN_EOF, "end of file"), \
 
 
-#define SCHED_ERRORS \
-	PARA_ERROR(PRE_EOF, "pre_select returned zero"), \
-	PARA_ERROR(POST_EOF, "post_select returned zero"), \
-
-
+#define STDOUT_ERRORS \
+	PARA_ERROR(STDOUT_WRITE, "failed to write to stdout"), \
+	PARA_ERROR(STDOUT_EOF, "end of file"), \
 
 
 #define NET_ERRORS \
@@ -122,12 +122,14 @@ extern const char **para_errlist[];
 	PARA_ERROR(TOO_MANY_BAD_CHUNKS, "too many consecutive bad chunks"), \
 	PARA_ERROR(INVALID_HEADER, "invalid header packet"), \
 	PARA_ERROR(OVERRUN, "outout buffer overrun"), \
+	PARA_ERROR(ORTP_RECV_EOF, "ortp_recv: end of file"), \
 
 
 #define HTTP_RECV_ERRORS \
 	PARA_ERROR(SEND_HTTP_REQUEST, "failed to send http request"), \
 	PARA_ERROR(MISSING_OK, "did not receive OK message from peer"), \
-	PARA_ERROR(HTTP_RECV_BUF, "did not receive buffer")
+	PARA_ERROR(HTTP_RECV_BUF, "did not receive buffer"), \
+	PARA_ERROR(HTTP_RECV_EOF, "http_recv: end of file"), \
 
 
 #define RECV_ERRORS \
@@ -152,6 +154,7 @@ extern const char **para_errlist[];
 #define FILTER_CHAIN_ERRORS \
 	PARA_ERROR(UNSUPPORTED_FILTER, "given filter not supported"), \
 	PARA_ERROR(BAD_FILTER_OPTIONS, "invalid filter option given"), \
+	PARA_ERROR(FC_EOF, "filter chain: eof"), \
 
 
 #define STAT_ERRORS \
@@ -193,6 +196,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \
 	PARA_ERROR(WAITPID, "waitpid error"), \
 	PARA_ERROR(SIGNAL_PIPE, "failed to setup signal pipe"), \
+	PARA_ERROR(SIGNAL_CAUGHT, "caught signal"), \
 
 
 #define STRING_ERRORS \
@@ -225,7 +229,6 @@ extern const char **para_errlist[];
 
 
 #define AAC_COMMON_ERRORS \
-	PARA_ERROR(AAC_BUF, "invalid buffer"), \
 	PARA_ERROR(ESDS, "did not find esds atom"), \
 	PARA_ERROR(STCO, "did not find stco atom"), \
 
@@ -326,6 +329,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(DCCP_SOCKET, "can not create dccp socket"), \
 	PARA_ERROR(DCCP_PACKET_SIZE, "failed to set dccp packet size"), \
 	PARA_ERROR(DCCP_SERVICE, "could not get service code"), \
+	PARA_ERROR(DCCP_RECV_EOF, "dccp_recv: end of file"), \
 
 
 #define DCCP_RECV_ERRORS \
@@ -346,10 +350,7 @@ extern const char **para_errlist[];
 
 
 #define WRITE_ERRORS \
-	PARA_ERROR(READ_HDR, "failed to read audio file header"), \
-	PARA_ERROR(READ_STDIN, "failed to read from stdin"), \
 	PARA_ERROR(WRITE_SYNTAX, "para_write syntax error"), \
-	PARA_ERROR(WRITE_OVERRUN, "buffer overrun"), \
 	PARA_ERROR(PREMATURE_END, "premature end of audio file"), \
 	PARA_ERROR(NO_WAV_HEADER, "wave header not found"), \
 	PARA_ERROR(WAV_HEADER_SUCCESS, "successfully read wave header"), \
@@ -375,7 +376,6 @@ 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_LOG, "snd_output_stdio_attach() failed"), \
 
 
 #define FILE_WRITER_ERRORS \
@@ -470,6 +470,7 @@ extern const char **para_errlist[];
 SS_ENUM(GUI);
 SS_ENUM(SCHED);
 SS_ENUM(STDIN);
+SS_ENUM(STDOUT);
 SS_ENUM(WAV);
 SS_ENUM(COMPRESS);
 SS_ENUM(TIME);