Merge branch 'master' into my-osx

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 477baadf1c30c352f08b1ffa5439e5a4b7b9e8a4..a64348e342e2aeef66a09b9e2e808f57366b002d 100644 (file)
--- a/error.h
+++ b/error.h
@@ -20,8 +20,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 +31,9 @@ enum para_subsystem {
        SS_RECV,
        SS_NET,
        SS_ORTP_RECV,
+       SS_CLIENT,
+       SS_AUDIOC,
+       SS_SCHED,
        SS_AUDIOD,
        SS_AUDIOD_COMMAND,
        SS_EXEC,
@@ -100,6 +101,15 @@ extern const char **para_errlist[];
        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"), \
@@ -549,6 +559,7 @@ 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 */