X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=78e3242cdd71b0d5484033d671b24088e735bf91;hp=a53531b7fbf4f29bbd67474b17e2d1778b410b9a;hb=8a8cd0f5bb40dcfad68608193e8c57decd90b25e;hpb=148c7c722fd5795228f586b6ef8d953662b68224

diff --git a/error.h b/error.h
index a53531b7..78e3242c 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_CLIENT,
 	SS_GUI,
 	SS_TIME,
 	SS_WAV,
@@ -31,10 +32,14 @@ enum para_subsystem {
 	SS_RECV,
 	SS_NET,
 	SS_ORTP_RECV,
+	SS_CLIENT_COMMON,
+	SS_AUDIOC,
+	SS_SCHED,
 	SS_AUDIOD,
+	SS_AUDIOD_COMMAND,
 	SS_EXEC,
-	SS_SCHED,
 	SS_STDIN,
+	SS_STDOUT,
 	SS_SIGNAL,
 	SS_STRING,
 	SS_STAT,
@@ -73,6 +78,7 @@ enum para_subsystem {
 
 /* these do not need error handling (yet) */
 #define SERVER_ERRORS
+#define CLIENT_ERRORS
 #define WAV_ERRORS
 #define COMPRESS_ERRORS
 #define TIME_ERRORS
@@ -83,19 +89,45 @@ enum para_subsystem {
 #define RINGBUFFER_ERRORS
 
 
+
 extern const char **para_errlist[];
 /** \endcond */
 
-#define STDIN_ERRORS \
-	PARA_ERROR(STDIN_READ, "failed to read from stdin"), \
-	PARA_ERROR(STDIN_EOF, "end of file"), \
+#define AUDIOC_ERRORS \
+	PARA_ERROR(AUDIOC_SYNTAX, "audioc syntax error"), \
+	PARA_ERROR(AUDIOC_READ, "audioc read error"), \
+	PARA_ERROR(AUDIOC_WRITE, "audioc write error"), \
+	PARA_ERROR(INIT_SOCK_ADDR, "can not init socket"), \
+	PARA_ERROR(AUDIOC_CONNECT, "audioc connect error"), \
+	PARA_ERROR(AUDIOC_OVERRUN, "audioc buffer overrun"), \
+
+
+
+
+#define CLIENT_COMMON_ERRORS \
+	PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
+	PARA_ERROR(INVALID_CHALLENGE, "did not receive valid challenge"), \
+	PARA_ERROR(NO_CONFIG, "config file not found"), \
+	PARA_ERROR(CLIENT_AUTH, "authentication failed"), \
+	PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \
+	PARA_ERROR(INPUT_EOF, "end of input"), \
+	PARA_ERROR(HANDSHAKE_COMPLETE, ""), /* not really an error */ \
 
 
 #define SCHED_ERRORS \
-	PARA_ERROR(PRE_EOF, "pre_select returned zero"), \
-	PARA_ERROR(POST_EOF, "post_select returned zero"), \
+	PARA_ERROR(TASK_KILLED, "task killed"), \
+	PARA_ERROR(NO_SUCH_TASK, "task not found"), \
+	PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \
+
+
+#define STDIN_ERRORS \
+	PARA_ERROR(STDIN_READ, "failed to read from stdin"), \
+	PARA_ERROR(STDIN_EOF, "end of file"), \
 
 
+#define STDOUT_ERRORS \
+	PARA_ERROR(STDOUT_WRITE, "failed to write to stdout"), \
+	PARA_ERROR(STDOUT_EOF, "end of file"), \
 
 
 #define NET_ERRORS \
@@ -122,12 +154,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 \
@@ -144,7 +178,12 @@ extern const char **para_errlist[];
 	PARA_ERROR(NO_MORE_SLOTS, "no more empty slots"), \
 	PARA_ERROR(MISSING_COLON, "syntax error: missing colon"), \
 	PARA_ERROR(UNSUPPORTED_AUDIO_FORMAT, "given audio format not supported"), \
+	PARA_ERROR(STATUS_EOF, "server closed status connection"), \
+
+
+#define AUDIOD_COMMAND_ERRORS \
 	PARA_ERROR(CLIENT_WRITE, "client write error"), \
+	PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \
 	PARA_ERROR(UCRED_PERM, "permission denied"), \
 	PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \
 
@@ -152,6 +191,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 +233,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 \
@@ -222,10 +263,10 @@ extern const char **para_errlist[];
 	PARA_ERROR(AAC_READ, "aac read error"), \
 	PARA_ERROR(STSZ, "did not find stcz atom"), \
 	PARA_ERROR(MP4ASC, "audio spec config error"), \
+	PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \
 
 
 #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 +367,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 +388,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 +414,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 +508,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);
@@ -478,6 +517,7 @@ SS_ENUM(ORTP_RECV);
 SS_ENUM(NET);
 SS_ENUM(RECV);
 SS_ENUM(AUDIOD);
+SS_ENUM(AUDIOD_COMMAND);
 SS_ENUM(EXEC);
 SS_ENUM(SIGNAL);
 SS_ENUM(STRING);
@@ -515,6 +555,9 @@ SS_ENUM(WRITE_COMMON);
 SS_ENUM(ALSA_WRITER);
 SS_ENUM(FILE_WRITER);
 SS_ENUM(RINGBUFFER);
+SS_ENUM(CLIENT);
+SS_ENUM(CLIENT_COMMON);
+SS_ENUM(AUDIOC);
 /** \endcond */
 #undef PARA_ERROR
 /* rest of the world only sees the error text */