X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=c53ab89a3b15192285de2f13048c4340c1fcd070;hp=347327a6242a5f6775e3152e229ff247ddd1e04a;hb=20ad4f0f93da79e2ec0a9699dff58b9922556438;hpb=6bdac07456cb5872f824028912d1049883a9c21f

diff --git a/error.h b/error.h
index 347327a6..c53ab89a 100644
--- a/error.h
+++ b/error.h
@@ -13,7 +13,6 @@ 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
@@ -29,14 +28,44 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define DCCP_SEND_ERRORS
 #define HTTP_SEND_ERRORS
 #define GGO_ERRORS
+#define COLOR_ERRORS
+#define SIGNAL_ERRORS
 
 
 extern const char **para_errlist[];
 
+#define PREBUFFER_FILTER_ERRORS \
+	PARA_ERROR(PREBUFFER_SYNTAX, "syntax error in prebuffer filter config"), \
+
+#define OSS_WRITE_ERRORS \
+	PARA_ERROR(BAD_SAMPLE_FORMAT, "sample format not supported"), \
+	PARA_ERROR(BAD_CHANNEL_COUNT, "channel count not supported"), \
+	PARA_ERROR(BAD_SAMPLERATE, "sample rate not supported"), \
+
+
 #define COMPRESS_FILTER_ERRORS \
 	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 zero or 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"), \
 
@@ -208,11 +237,10 @@ extern const char **para_errlist[];
 
 
 #define UDP_RECV_ERRORS \
-	PARA_ERROR(UDP_NO_MAGIC, "not enough magic"), \
 	PARA_ERROR(UDP_SYNTAX, "udp_recv syntax error"), \
-	PARA_ERROR(UDP_SHORT_PACKET, "udp data packet too short"), \
-	PARA_ERROR(INVALID_HEADER, "invalid header packet"), \
-	PARA_ERROR(OVERRUN, "output buffer overrun"), \
+	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 \
@@ -282,10 +310,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(FILTER_SYNTAX, "syntax error"), \
 
 
-#define SIGNAL_ERRORS \
-	PARA_ERROR(SIGNAL_SIG_ERR, "signal() returned SIG_ERR"), \
-
-
 #define STRING_ERRORS \
 	PARA_ERROR(ATOI_OVERFLOW, "value too large"), \
 	PARA_ERROR(STRTOLL, "unknown strtoll error"), \
@@ -330,6 +354,7 @@ extern const char **para_errlist[];
 
 #define VSS_ERRORS \
 	PARA_ERROR(NOFD, "did not receive open fd from afs"), \
+	PARA_ERROR(BAD_CT, "invalid chunk table or bad FEC configuration")
 
 
 #define CRYPT_ERRORS \
@@ -359,8 +384,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 \
@@ -377,11 +400,10 @@ 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"), \
-	PARA_ERROR(SND_PCM_INFO, "pcm info error"), \
+	PARA_ERROR(PHYSICAL_WIDTH, "unable to determine bytes per frame"), \
 	PARA_ERROR(GET_BUFFER_TIME, "snd_pcm_hw_params_get_buffer_time_max() failed"), \
 	PARA_ERROR(SET_BUFFER_TIME, "snd_pcm_hw_params_set_buffer_time_near() failed"), \
 	PARA_ERROR(SET_RATE, "snd_pcm_hw_params_set_rate_near failed"), \