X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=f6f916ae03bf90f5200bbbb4eb36c72f3f24e48a;hp=5dd750a748edea7b22c378948d29a9a09dc843a8;hb=68ae99f74f658df5eb53c7ef0127a210e3defd5e;hpb=d041f4528426640d73d141cec7fd2576f7e8be84

diff --git a/error.h b/error.h
index 5dd750a7..f6f916ae 100644
--- a/error.h
+++ b/error.h
@@ -20,8 +20,6 @@
 
 /** \cond list of all subsystems that support the shiny error facility */
 enum para_subsystem {
-	SS_CLIENT,
-	SS_SCHED,
 	SS_GUI,
 	SS_TIME,
 	SS_WAV,
@@ -33,7 +31,11 @@ enum para_subsystem {
 	SS_RECV,
 	SS_NET,
 	SS_ORTP_RECV,
+	SS_CLIENT,
+	SS_AUDIOC,
+	SS_SCHED,
 	SS_AUDIOD,
+	SS_AUDIOD_COMMAND,
 	SS_EXEC,
 	SS_STDIN,
 	SS_STDOUT,
@@ -89,16 +91,30 @@ enum para_subsystem {
 extern const char **para_errlist[];
 /** \endcond */
 
+#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_ERRORS \
 	PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
 	PARA_ERROR(INVALID_CHALLENGE, "did not receive valid challenge"), \
 	PARA_ERROR(CLIENT_AUTH, "authentication failed"), \
 	PARA_ERROR(SHORT_CLIENT_WRITE, "short client write"), \
 	PARA_ERROR(NO_CONFIG, "config file not found"), \
+	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(TASK_KILLED, "task killed"), \
 	PARA_ERROR(NO_SUCH_TASK, "task not found"), \
+	PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \
 
 
 #define STDIN_ERRORS \
@@ -159,11 +175,14 @@ 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"), \
-	PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \
-	PARA_ERROR(STATUS_EOF, "server closed status connection"), \
 
 
 #define FILTER_CHAIN_ERRORS \
@@ -495,6 +514,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);
@@ -533,6 +553,7 @@ SS_ENUM(ALSA_WRITER);
 SS_ENUM(FILE_WRITER);
 SS_ENUM(RINGBUFFER);
 SS_ENUM(CLIENT);
+SS_ENUM(AUDIOC);
 /** \endcond */
 #undef PARA_ERROR
 /* rest of the world only sees the error text */