X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=844c0045d0d2a7287d70b0bd1ed95901971fbbe3;hp=2474e0ab87778a01da7c8c70290bc22b41d901e0;hb=243e312286c1dd14cca22e96a9e6882eb95152b0;hpb=02dd632ab2a6696aff7b6c6d108069704cfe871a

diff --git a/error.h b/error.h
index 2474e0ab..844c0045 100644
--- a/error.h
+++ b/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -33,14 +33,37 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define FILE_WRITE_ERRORS
 #define STDIN_ERRORS
 #define WRITE_ERRORS
+#define CHECK_WAV_ERRORS
 
 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 RESAMPLE_FILTER_ERRORS \
+	PARA_ERROR(RESAMPLE_EOF, "resample filter: end of file"), \
+	PARA_ERROR(LIBSAMPLERATE, "secret rabbit code error"), \
+
+
 #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, "para_play: syntax error"), \
+	PARA_ERROR(NO_VALID_FILES, "no valid file found in playlist"), \
+	PARA_ERROR(TERM_RQ, "user termination request"), \
+	PARA_ERROR(BAD_PLAY_CMD, "invalid command"), \
+
+
 #define FLACDEC_FILTER_ERRORS \
 	PARA_ERROR(FLACDEC_DECODER_ALLOC, "could not allocate stream decoder"), \
 	PARA_ERROR(FLACDEC_DECODER_INIT, "could not init stream decoder"), \
@@ -59,6 +82,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?)"), \
@@ -262,6 +289,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \
 	PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \
 	PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \
+	PARA_ERROR(INCOMPAT_FEAT, "client/server incompatibility"), \
 
 
 #define SCHED_ERRORS \
@@ -436,7 +464,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \
 	PARA_ERROR(SERVER_CRASH, "para_server crashed -- can not live without it"), \
 	PARA_ERROR(BAD_USER, "auth request for invalid user"), \
-	PARA_ERROR(BAD_FEATURE, "request for unknown or invalid feature"), \
+	PARA_ERROR(BAD_FEATURE, "invalid feature request"), \
 	PARA_ERROR(BAD_AUTH, "authentication failure"), \
 
 
@@ -472,6 +500,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 */