X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=3b31d82e529e7fb84955d4d2f2498a72812e709e;hp=477baadf1c30c352f08b1ffa5439e5a4b7b9e8a4;hb=db02b614d1231685e64b27b4838c7cd699e51790;hpb=1e2990131a4c26662aa89df52f1ffeba922bf46d

diff --git a/error.h b/error.h
index 477baadf..3b31d82e 100644
--- a/error.h
+++ b/error.h
@@ -21,7 +21,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,6 +32,9 @@ enum para_subsystem {
 	SS_RECV,
 	SS_NET,
 	SS_ORTP_RECV,
+	SS_CLIENT_COMMON,
+	SS_AUDIOC,
+	SS_SCHED,
 	SS_AUDIOD,
 	SS_AUDIOD_COMMAND,
 	SS_EXEC,
@@ -77,6 +79,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
@@ -100,16 +103,31 @@ extern const char **para_errlist[];
 	PARA_ERROR(DEFAULT_COMP, "can not find default audio output component"), \
 
 
-#define CLIENT_ERRORS \
+#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(CLIENT_AUTH, "authentication failed"), \
-	PARA_ERROR(SHORT_CLIENT_WRITE, "short client write"), \
 	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(TASK_KILLED, "task killed"), \
 	PARA_ERROR(NO_SUCH_TASK, "task not found"), \
+	PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \
 
 
 #define STDIN_ERRORS \
@@ -340,6 +358,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
 	PARA_ERROR(LOCK, "lock error"), \
 	PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \
+	PARA_ERROR(SERVER_CRASH, "para_server crashed -- can not live without it"), \
 
 
 #define PLAYLIST_SELECTOR_ERRORS \
@@ -549,6 +568,8 @@ SS_ENUM(FILE_WRITER);
 SS_ENUM(OSX_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 */