X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=422ddfd263fba2d08e05dcfe0cb6eb73b1aac23b;hp=cfd2b1bdccb29ad4dede7f4f4988ba60f0000411;hb=0eb69b6d45c54deda1724b2db2202cf4057b0309;hpb=6101e63b98b5517b65bd967e6efbb0af47738084 diff --git a/error.h b/error.h index cfd2b1bd..422ddfd2 100644 --- a/error.h +++ b/error.h @@ -29,16 +29,34 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define COLOR_ERRORS #define SIGNAL_ERRORS #define FADE_ERRORS -#define SERVER_COMMAND_LIST_ERRORS -#define AFS_COMMAND_LIST_ERRORS -#define AUDIOD_COMMAND_LIST_ERRORS #define STDOUT_ERRORS #define FILE_WRITE_ERRORS #define STDIN_ERRORS #define WRITE_ERRORS +#define CHECK_WAV_ERRORS extern const char **para_errlist[]; +#define OSS_MIX_ERRORS \ + PARA_ERROR(OSS_MIXER_CHANNEL, "invalid mixer channel"), \ + +#define ALSA_MIX_ERRORS \ + PARA_ERROR(ALSA_MIX_OPEN, "could not open mixer"), \ + PARA_ERROR(ALSA_MIX_BAD_ELEM, "invalid/unsupported control element"), \ + PARA_ERROR(ALSA_MIX_GET_VAL, "could not read control element state"), \ + PARA_ERROR(ALSA_MIX_SET_VAL, "could not set control element state"), \ + + +#define RESAMPLE_FILTER_ERRORS \ + PARA_ERROR(RESAMPLE_EOF, "resample filter: end of file"), \ + PARA_ERROR(LIBSAMPLERATE, "secret rabbit code error"), \ + + +#define SIDEBAND_ERRORS \ + PARA_ERROR(BAD_BAND, "invalid or unexpected band designator"), \ + PARA_ERROR(SB_PACKET_SIZE, "invalid sideband packet size or protocol error"), \ + + #define FLACDEC_FILTER_ERRORS \ PARA_ERROR(FLACDEC_DECODER_ALLOC, "could not allocate stream decoder"), \ PARA_ERROR(FLACDEC_DECODER_INIT, "could not init stream decoder"), \ @@ -258,6 +276,8 @@ extern const char **para_errlist[]; PARA_ERROR(BAD_CONFIG, "syntax error in config file"), \ PARA_ERROR(CLIENT_AUTH, "authentication failed"), \ PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \ + PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \ + PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \ #define SCHED_ERRORS \ @@ -352,7 +372,8 @@ extern const char **para_errlist[]; PARA_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \ PARA_ERROR(ATOI_JUNK_AT_END, "further characters after number"), \ PARA_ERROR(SIZE_PREFIX, "bad size prefix"), \ - PARA_ERROR(REGEX, "regular expression error") \ + PARA_ERROR(REGEX, "regular expression error"), \ + PARA_ERROR(ARG_NOT_FOUND, "argument not found in arg vector"), \ #define EXEC_ERRORS \ @@ -431,6 +452,7 @@ extern const char **para_errlist[]; PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \ PARA_ERROR(SERVER_CRASH, "para_server crashed -- can not live without it"), \ PARA_ERROR(BAD_USER, "auth request for invalid user"), \ + PARA_ERROR(BAD_FEATURE, "request for unknown or invalid feature"), \ PARA_ERROR(BAD_AUTH, "authentication failure"), \