X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=f492eff190b4bfaf67871ba3fe9fda8fc550b400;hp=df2a240c24681c2d72b213183d80ccd877ffb9be;hb=190eec54bed8fe79e0ccd72614b253d591e76b4f;hpb=9d3d1339845435d5d7bb44b858ea6b3a94ce2cb9

diff --git a/error.h b/error.h
index df2a240c..f492eff1 100644
--- a/error.h
+++ b/error.h
@@ -13,7 +13,6 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 
 /* these do not need error handling (yet) */
 #define SERVER_ERRORS
-#define CLIENT_ERRORS
 #define WAV_ERRORS
 #define COMPRESS_ERRORS
 #define TIME_ERRORS
@@ -27,9 +26,15 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define RBTREE_ERRORS
 #define RECV_ERRORS
 #define SEND_COMMON_ERRORS
+#define STDOUT_ERRORS
+
 
 extern const char **para_errlist[];
 
+#define CLIENT_ERRORS \
+	PARA_ERROR(TASK_STARTED, "task started"), \
+
+
 #define AFH_ERRORS \
 	PARA_ERROR(AFH_SYNTAX, "afh syntax error"), \
 	PARA_ERROR(AFH_SHORT_WRITE, "afh short write"), \
@@ -160,23 +165,19 @@ extern const char **para_errlist[];
 	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(HANDSHAKE_COMPLETE, ""), /* not really an error */ \
 
 
 #define SCHED_ERRORS \
 	PARA_ERROR(TASK_KILLED, "task killed"), \
+	PARA_ERROR(TASK_UNREGISTERED, "task has been unscheduled"), \
 	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"), \
-
 
 #define NET_ERRORS \
 	PARA_ERROR(NAME_TOO_LONG, "name too long for struct sockaddr_un"), \
@@ -210,8 +211,9 @@ 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(SIGNAL_CAUGHT, "caught signal"), \
 	PARA_ERROR(NOT_PLAYING, "not playing"), \
+	PARA_ERROR(AUDIOD_OFF, "audiod switched off"), \
+	PARA_ERROR(STATUS_TIMEOUT, "timeout reading server status"), \
 
 
 #define AUDIOD_COMMAND_ERRORS \
@@ -263,7 +265,6 @@ extern const char **para_errlist[];
 
 #define SIGNAL_ERRORS \
 	PARA_ERROR(SIGNAL_SIG_ERR, "signal() returned SIG_ERR"), \
-	PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \
 
 
 #define STRING_ERRORS \
@@ -364,7 +365,6 @@ extern const char **para_errlist[];
 
 #define WRITE_ERRORS \
 	PARA_ERROR(WRITE_SYNTAX, "para_write syntax error"), \
-	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"), \
 	PARA_ERROR(NO_DELAY, "no initial delay"), \