X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=285191cc9bcebd0e109824e814084fec6e322b85;hp=5dd750a748edea7b22c378948d29a9a09dc843a8;hb=d0557ca0ee0c39111c5e9f69121d69a2d26b8ed6;hpb=d041f4528426640d73d141cec7fd2576f7e8be84 diff --git a/error.h b/error.h index 5dd750a7..285191cc 100644 --- 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,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, @@ -89,6 +91,16 @@ enum para_subsystem { 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"), \ @@ -159,11 +171,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 \ @@ -495,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); @@ -533,6 +549,7 @@ 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 */