simplify osx_write_pre_select()

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 5dd750a748edea7b22c378948d29a9a09dc843a8..3b31d82e529e7fb84955d4d2f2498a72812e709e 100644 (file)
--- 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,7 +32,11 @@ 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_STDIN,
        SS_STDOUT,
@@ -70,11 +73,13 @@ enum para_subsystem {
        SS_WRITE_COMMON,
        SS_ALSA_WRITER,
        SS_FILE_WRITER,
+       SS_OSX_WRITER,
        NUM_SS
 };
 
 /* these do not need error handling (yet) */
 #define SERVER_ERRORS
+#define CLIENT_ERRORS
 #define WAV_ERRORS
 #define COMPRESS_ERRORS
 #define TIME_ERRORS
@@ -89,16 +94,40 @@ enum para_subsystem {
 extern const char **para_errlist[];
 /** \endcond */
 
-#define CLIENT_ERRORS \
+#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_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 \
@@ -159,11 +188,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 \
@@ -326,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 \
@@ -495,6 +528,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);
@@ -531,8 +565,11 @@ 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(CLIENT_COMMON);
+SS_ENUM(AUDIOC);
 /** \endcond */
 #undef PARA_ERROR
 /* rest of the world only sees the error text */