X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=b8b0074caf536902f05768b3cfae1fc14784c18b;hb=99bb7973ee352af158ac90416017e154b6d341bd;hp=ed905a108dffe5be44e4cc8051da0582e144262b;hpb=0a5226b8f6b9131024893f35de615d0b829afe27;p=paraslash.git

diff --git a/error.h b/error.h
index ed905a10..b8b0074c 100644
--- a/error.h
+++ b/error.h
@@ -103,7 +103,18 @@ extern const char **para_errlist[];
 	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"), \
-	PARA_ERROR(OSS_EOF, "oss: end of file"), \
+
+
+#define AO_WRITE_ERRORS \
+	PARA_ERROR(AO_DEFAULT_DRIVER, "ao: no usable output device"), \
+	PARA_ERROR(AO_BAD_DRIVER, "ao: invalid driver"), \
+	PARA_ERROR(AO_BAD_OPTION, "ao option is not of type key:value"), \
+	PARA_ERROR(AO_APPEND_OPTION, "ao append option: memory allocation failure"), \
+	PARA_ERROR(AO_OPEN_LIVE, "ao: could not open audio device"), \
+	PARA_ERROR(AO_FILE_NOT_SUPP, "ao: file io drivers not supported"), \
+	PARA_ERROR(AO_PLAY, "ao_play() failed"), \
+	PARA_ERROR(AO_BAD_SAMPLE_FORMAT, "ao: unsigned sample formats not supported"), \
+	PARA_ERROR(AO_PTHREAD, "pthread error"), \
 
 
 #define COMPRESS_FILTER_ERRORS \
@@ -230,8 +241,6 @@ extern const char **para_errlist[];
 
 
 #define SCHED_ERRORS \
-	PARA_ERROR(TASK_KILLED, "task killed"), \
-	PARA_ERROR(NO_SUCH_TASK, "task not found"), \
 	PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \
 	PARA_ERROR(SCHED_SHUTDOWN, "scheduler was shut down"), \
 
@@ -276,7 +285,6 @@ extern const char **para_errlist[];
 
 #define AUDIOD_COMMAND_ERRORS \
 	PARA_ERROR(CLIENT_WRITE, "client write error"), \
-	PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \
 	PARA_ERROR(UCRED_PERM, "permission denied"), \
 	PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \
 	PARA_ERROR(TOO_MANY_CLIENTS, "maximal number of stat clients exceeded"), \
@@ -396,7 +404,6 @@ extern const char **para_errlist[];
 
 #define WRITE_ERRORS \
 	PARA_ERROR(WRITE_SYNTAX, "para_write syntax error"), \
-	PARA_ERROR(NO_WAV_HEADER, "wave header not found"), \
 
 
 #define ALSA_WRITE_ERRORS \
@@ -414,12 +421,11 @@ extern const char **para_errlist[];
 	PARA_ERROR(SET_RATE, "snd_pcm_hw_params_set_rate_near failed"), \
 	PARA_ERROR(START_THRESHOLD, "snd_pcm_sw_params_set_start_threshold() failed"), \
 	PARA_ERROR(STOP_THRESHOLD, "snd_pcm_sw_params_set_stop_threshold() failed"), \
-	PARA_ERROR(ALSA_EOF, "alsa: end of file"), \
-
 
 
 #define WRITE_COMMON_ERRORS \
 	PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \
+	PARA_ERROR(WRITE_COMMON_EOF, "end of file"), \
 
 
 #define AACDEC_FILTER_ERRORS \