audioc: use the error subsystem

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 8458ae2bb1b7dea13c242949bb2b8763d1213ef2..285191cc9bcebd0e109824e814084fec6e322b85 100644 (file)
--- 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,
@@ -82,12 +85,34 @@ enum para_subsystem {
 #define ORTP_SEND_ERRORS
 #define GUI_ERRORS
 #define RINGBUFFER_ERRORS
-#define SCHED_ERRORS
+
 
 
 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(CREDENTIALS, "failed to send unix socket credentials"), \
+       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 +171,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"), \
 
@@ -226,6 +256,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 \
@@ -479,6 +510,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);
@@ -516,6 +548,8 @@ SS_ENUM(WRITE_COMMON);
 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 */