X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=a64348e342e2aeef66a09b9e2e808f57366b002d;hp=aa5666b392dc6b2dbca8fe89deaaeeb1e5e36af4;hb=e7a40750746aa95f665629e0453e962d55897e36;hpb=39ef1da5509461b18beb5b8f16ff6118c20c0ac6

diff --git a/error.h b/error.h
index aa5666b3..a64348e3 100644
--- a/error.h
+++ b/error.h
@@ -20,7 +20,6 @@
 
 /** \cond list of all subsystems that support the shiny error facility */
 enum para_subsystem {
-	SS_SCHED,
 	SS_GUI,
 	SS_TIME,
 	SS_WAV,
@@ -32,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,
@@ -69,6 +72,7 @@ enum para_subsystem {
 	SS_WRITE_COMMON,
 	SS_ALSA_WRITER,
 	SS_FILE_WRITER,
+	SS_OSX_WRITER,
 	NUM_SS
 };
 
@@ -82,12 +86,42 @@ enum para_subsystem {
 #define ORTP_SEND_ERRORS
 #define GUI_ERRORS
 #define RINGBUFFER_ERRORS
-#define SCHED_ERRORS
+
 
 
 extern const char **para_errlist[];
 /** \endcond */
 
+#define OSX_WRITER_ERRORS \
+	PARA_ERROR(STREAM_FORMAT, "could not set stream format"), \
+	PARA_ERROR(ADD_CALLBACK, "can not add callback"), \
+	PARA_ERROR(READ_STDIN, "failed to read from stdin"), \
+	PARA_ERROR(OPEN_COMP, "OpenAComponent() error"), \
+	PARA_ERROR(UNIT_INIT, "AudioUnitInitialize() error"), \
+	PARA_ERROR(DEFAULT_COMP, "can not find default audio output component"), \
+
+
+#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"), \
+
+#define SCHED_ERRORS \
+	PARA_ERROR(TASK_KILLED, "task killed"), \
+	PARA_ERROR(NO_SUCH_TASK, "task not found"), \
+
+
 #define STDIN_ERRORS \
 	PARA_ERROR(STDIN_READ, "failed to read from stdin"), \
 	PARA_ERROR(STDIN_EOF, "end of file"), \
@@ -146,7 +180,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"), \
 
@@ -154,6 +193,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 \
@@ -195,6 +235,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 \
@@ -224,6 +265,7 @@ 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 \
@@ -477,6 +519,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);
@@ -513,7 +556,10 @@ SS_ENUM(WRITE);
 SS_ENUM(WRITE_COMMON);
 SS_ENUM(ALSA_WRITER);
 SS_ENUM(FILE_WRITER);
+SS_ENUM(OSX_WRITER);
 SS_ENUM(RINGBUFFER);
+SS_ENUM(CLIENT);
+SS_ENUM(AUDIOC);
 /** \endcond */
 #undef PARA_ERROR
 /* rest of the world only sees the error text */