X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=983f653bef9345c90c70d9a0e0fea52d12283099;hp=8458ae2bb1b7dea13c242949bb2b8763d1213ef2;hb=65572373b52dad3f2ff3b8302a6f7491553f07b1;hpb=2a8029478dfc65f0c935d864faf4aea9e3deb27d diff --git a/error.h b/error.h index 8458ae2b..983f653b 100644 --- a/error.h +++ b/error.h @@ -20,6 +20,7 @@ /** \cond list of all subsystems that support the shiny error facility */ enum para_subsystem { + SS_CLIENT, SS_SCHED, SS_GUI, SS_TIME, @@ -33,6 +34,7 @@ enum para_subsystem { SS_NET, SS_ORTP_RECV, SS_AUDIOD, + SS_AUDIOD_COMMAND, SS_EXEC, SS_STDIN, SS_STDOUT, @@ -82,12 +84,24 @@ enum para_subsystem { #define ORTP_SEND_ERRORS #define GUI_ERRORS #define RINGBUFFER_ERRORS -#define SCHED_ERRORS + extern const char **para_errlist[]; /** \endcond */ +#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 +160,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 +245,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 +499,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 +537,7 @@ SS_ENUM(WRITE_COMMON); SS_ENUM(ALSA_WRITER); SS_ENUM(FILE_WRITER); SS_ENUM(RINGBUFFER); +SS_ENUM(CLIENT); /** \endcond */ #undef PARA_ERROR /* rest of the world only sees the error text */