X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=fd2e01a8fd78a92819cd0c8676199804261b32dc;hp=3100b31299b3064fb47875bdbef971425e02fd11;hb=d02f88dfc3911262174afe6017e04d70e8557a7a;hpb=1745a87654ce08b57c46ce0870d8571eacbe27c9 diff --git a/error.h b/error.h index 3100b312..fd2e01a8 100644 --- a/error.h +++ b/error.h @@ -29,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 @@ -39,11 +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"), \ @@ -62,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?)"), \ @@ -475,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 */