X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=7de3f436510fa42833933aac0e333a3f56b3d0f9;hp=37ff48a9463780220cd7e02b431d622080a432a4;hb=172ee701ffbdf22edcd0b5175344ab5e6da40412;hpb=ebe54cf6ee1b9c5daf7837cb618c299a5b5187e0 diff --git a/error.h b/error.h index 37ff48a9..7de3f436 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. */ @@ -13,11 +13,10 @@ DEFINE_ERRLIST_OBJECT_ENUM; /* these do not need error handling (yet) */ #define SERVER_ERRORS -#define WAV_FILTER_ERRORS #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 @@ -29,7 +28,7 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define DCCP_SEND_ERRORS #define HTTP_SEND_ERRORS #define GGO_ERRORS - +#define COLOR_ERRORS extern const char **para_errlist[]; @@ -37,6 +36,25 @@ extern const char **para_errlist[]; PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \ +#define WAV_FILTER_ERRORS \ + PARA_ERROR(WAV_BAD_FC, "invalid filter chain configuration"), \ + + +#define FEC_ERRORS \ + PARA_ERROR(FEC_BAD_IDX, "invalid index vector"), \ + PARA_ERROR(FEC_SINGULAR, "unexpected singular matrix"), \ + PARA_ERROR(FEC_PIVOT, "pivot column not found"), \ + PARA_ERROR(FEC_PARMS, "invalid fec parameters"), \ + + +#define FECDEC_FILTER_ERRORS \ + PARA_ERROR(BAD_FEC_HEADER, "invalid fec header"), \ + PARA_ERROR(BAD_SLICE_SIZE, "slice size too large"), \ + PARA_ERROR(BAD_SLICE_NUM, "invalid slice number"), \ + PARA_ERROR(FECDEC_OVERRUN, "fecdec output buffer overrun"), \ + PARA_ERROR(FECDEC_EOF, "received eof packet"), \ + + #define AMP_FILTER_ERRORS \ PARA_ERROR(AMP_SYNTAX, "syntax error in amp filter config"), \ @@ -207,13 +225,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 \ @@ -360,8 +376,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 \ @@ -378,7 +392,6 @@ extern const char **para_errlist[]; PARA_ERROR(SAMPLE_FORMAT, "sample format not available"), \ PARA_ERROR(CHANNEL_COUNT, "channels count not available"), \ PARA_ERROR(HW_PARAMS, "unable to install hw params"), \ - PARA_ERROR(SW_PARAMS, "unable to install sw params"), \ PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \ PARA_ERROR(ALSA_WRITE, "alsa write error"), \ PARA_ERROR(PCM_OPEN, "unable to open pcm"), \