X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=fd2e01a8fd78a92819cd0c8676199804261b32dc;hp=63d4d5db9b6690dacd49505dda27504120309fe7;hb=d02f88dfc3911262174afe6017e04d70e8557a7a;hpb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0 diff --git a/error.h b/error.h index 63d4d5db..fd2e01a8 100644 --- a/error.h +++ b/error.h @@ -17,6 +17,7 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define CLOSE_ON_FORK_ERRORS #define DAEMON_ERRORS #define GUI_ERRORS +#define GUI_THEME_ERRORS #define RINGBUFFER_ERRORS #define SCORE_ERRORS #define RBTREE_ERRORS @@ -28,9 +29,6 @@ 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 @@ -38,6 +36,24 @@ DEFINE_ERRLIST_OBJECT_ENUM; 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 SIDEBAND_ERRORS \ + PARA_ERROR(BAD_BAND, "invalid or unexpected band designator"), \ + PARA_ERROR(SB_PACKET_SIZE, "invalid sideband packet size or protocol error"), \ + + +#define PLAY_ERRORS \ + PARA_ERROR(PLAY_SYNTAX, "play syntax 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"), \ @@ -56,6 +72,10 @@ extern const char **para_errlist[]; PARA_ERROR(FLAC_STREAMINFO, "could not read stream info meta block"), \ +#define AFH_RECV_ERRORS \ + PARA_ERROR(AFH_RECV_BAD_FILENAME, "invalid file name"), \ + + #define OGG_AFH_COMMON_ERRORS \ PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error (first packet)"), \ PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \ @@ -257,6 +277,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 \ @@ -351,7 +373,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 \ @@ -430,6 +453,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"), \ @@ -441,6 +465,8 @@ extern const char **para_errlist[]; PARA_ERROR(FGETS, "fgets error"), \ PARA_ERROR(EOF, "end of file"), \ PARA_ERROR(READ_PATTERN, "did not read expected pattern"), \ + PARA_ERROR(SHORT_WRITE, "unexpected short write"), \ + PARA_ERROR(EMPTY, "file is empty"), \ #define ALSA_WRITE_ERRORS \ @@ -463,6 +489,7 @@ extern const char **para_errlist[]; #define INTERACTIVE_ERRORS \ PARA_ERROR(I9E_EOF, "end of input"), \ PARA_ERROR(I9E_SETUPTERM, "failed to set up terminal"), \ + PARA_ERROR(I9E_TERM_RQ, "received termination request"), \ /** \endcond errors */