X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=0a5fb21775c58b9437fa0bfe2ec70c86ac602ff3;hp=92aaff5d4475393d17c6253e523b30951085bcd2;hb=6ba0a5055cfdec25d54d90a56f9345d5d4be09be;hpb=dd0b1f12758ac877de6834b34f8c7f9291d4311d diff --git a/error.h b/error.h index 92aaff5d..0a5fb217 100644 --- a/error.h +++ b/error.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2008 Andre Noll + * Copyright (C) 2006-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -17,7 +17,7 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define TIME_ERRORS #define CLOSE_ON_FORK_ERRORS #define DAEMON_ERRORS -#define ORTP_SEND_ERRORS +#define UDP_SEND_ERRORS #define GUI_ERRORS #define RINGBUFFER_ERRORS #define SCORE_ERRORS @@ -28,6 +28,8 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define IPC_ERRORS #define DCCP_SEND_ERRORS #define HTTP_SEND_ERRORS +#define GGO_ERRORS +#define COLOR_ERRORS extern const char **para_errlist[]; @@ -206,13 +208,11 @@ extern const char **para_errlist[]; PARA_ERROR(RECV_PATTERN, "did not receive expected pattern"), \ -#define ORTP_RECV_ERRORS \ - PARA_ERROR(MSG_TO_BUF, "failed to extract rtp packet"), \ - PARA_ERROR(ORTP_SYNTAX, "ortp syntax error"), \ - PARA_ERROR(TOO_MANY_BAD_CHUNKS, "too many consecutive bad chunks"), \ - PARA_ERROR(INVALID_HEADER, "invalid header packet"), \ - PARA_ERROR(OVERRUN, "output buffer overrun"), \ - PARA_ERROR(ORTP_RECV_EOF, "ortp_recv: end of file"), \ +#define UDP_RECV_ERRORS \ + PARA_ERROR(UDP_SYNTAX, "udp_recv syntax error"), \ + PARA_ERROR(UDP_BAD_HEADER, "invalid udp audio header"), \ + PARA_ERROR(UDP_OVERRUN, "output buffer overrun"), \ + PARA_ERROR(UDP_BAD_STREAM_TYPE, "invalid stream type"), \ #define HTTP_RECV_ERRORS \ @@ -240,7 +240,7 @@ extern const char **para_errlist[]; PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \ -#define FILTER_CHAIN_ERRORS \ +#define FILTER_COMMON_ERRORS \ PARA_ERROR(UNSUPPORTED_FILTER, "given filter not supported"), \ PARA_ERROR(BAD_FILTER_OPTIONS, "invalid filter option given"), \ PARA_ERROR(FC_EOF, "filter chain: eof"), \ @@ -274,6 +274,7 @@ extern const char **para_errlist[]; #define MP3DEC_FILTER_ERRORS \ PARA_ERROR(MAD_FRAME_DECODE, "mad frame decode error"), \ PARA_ERROR(MP3DEC_OVERRUN, "mp3 output buffer overrun"), \ + PARA_ERROR(MP3DEC_SYNTAX, "syntax error in mp3dec config"), \ #define FILTER_ERRORS \ @@ -358,8 +359,6 @@ extern const char **para_errlist[]; #define FD_ERRORS \ PARA_ERROR(FGETS, "fgets error"), \ - PARA_ERROR(EMPTY, "file empty"), \ - PARA_ERROR(MMAP, "mmap error"), \ #define WRITE_ERRORS \