X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=5e3a8df0e342b0dd3b47b9a138244706f848a17d;hb=3f885cd259fef0d8522bfc358defdc2345c5923a;hp=6b8403d1a91c3fd67e2a73f5e971f07896970e43;hpb=335730538150250f32c0df0b184fb494e2bb0df3;p=paraslash.git diff --git a/error.h b/error.h index 6b8403d1..5e3a8df0 100644 --- a/error.h +++ b/error.h @@ -13,7 +13,6 @@ DEFINE_ERRLIST_OBJECT_ENUM; /* these do not need error handling (yet) */ #define SERVER_ERRORS -#define CLIENT_ERRORS #define WAV_ERRORS #define COMPRESS_ERRORS #define TIME_ERRORS @@ -32,6 +31,14 @@ DEFINE_ERRLIST_OBJECT_ENUM; extern const char **para_errlist[]; +#define FADE_ERRORS \ + PARA_ERROR(FADE_SYNTAX, "fade syntax error"), \ + + +#define CLIENT_ERRORS \ + PARA_ERROR(TASK_STARTED, "task started"), \ + + #define AFH_ERRORS \ PARA_ERROR(AFH_SYNTAX, "afh syntax error"), \ PARA_ERROR(AFH_SHORT_WRITE, "afh short write"), \ @@ -166,6 +173,7 @@ extern const char **para_errlist[]; #define SCHED_ERRORS \ PARA_ERROR(TASK_KILLED, "task killed"), \ + PARA_ERROR(TASK_UNREGISTERED, "task has been unscheduled"), \ PARA_ERROR(NO_SUCH_TASK, "task not found"), \ PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \ @@ -208,6 +216,8 @@ extern const char **para_errlist[]; PARA_ERROR(MISSING_COLON, "syntax error: missing colon"), \ PARA_ERROR(UNSUPPORTED_AUDIO_FORMAT, "given audio format not supported"), \ PARA_ERROR(NOT_PLAYING, "not playing"), \ + PARA_ERROR(AUDIOD_OFF, "audiod switched off"), \ + PARA_ERROR(STATUS_TIMEOUT, "timeout reading server status"), \ #define AUDIOD_COMMAND_ERRORS \ @@ -270,7 +280,6 @@ extern const char **para_errlist[]; #define EXEC_ERRORS \ PARA_ERROR(DUP_PIPE, "exec error: can not create pipe"), \ - PARA_ERROR(NULL_OPEN, "can not open /dev/null"), \ #define MP3_AFH_ERRORS \ @@ -354,7 +363,6 @@ extern const char **para_errlist[]; PARA_ERROR(FGETS, "fgets error"), \ PARA_ERROR(EMPTY, "file empty"), \ PARA_ERROR(MMAP, "mmap error"), \ - PARA_ERROR(MUNMAP, "munmap failed"), \ #define WRITE_ERRORS \