X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=5307774b3d917d25642bb3ac11a5bb1323228599;hp=cfd2b1bdccb29ad4dede7f4f4988ba60f0000411;hb=8bcf75a3921d15e03c4351b3efa609eac67c3817;hpb=6101e63b98b5517b65bd967e6efbb0af47738084

diff --git a/error.h b/error.h
index cfd2b1bd..5307774b 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.
  */
@@ -29,16 +29,44 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define COLOR_ERRORS
 #define SIGNAL_ERRORS
 #define FADE_ERRORS
-#define SERVER_COMMAND_LIST_ERRORS
-#define AFS_COMMAND_LIST_ERRORS
-#define AUDIOD_COMMAND_LIST_ERRORS
 #define STDOUT_ERRORS
 #define FILE_WRITE_ERRORS
 #define STDIN_ERRORS
 #define WRITE_ERRORS
+#define CHECK_WAV_ERRORS
+#define OPUSDEC_FILTER_ERRORS
+#define OPUS_AFH_ERRORS
+#define OPUS_COMMON_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"), \
@@ -57,6 +85,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?)"), \
@@ -258,6 +290,8 @@ extern const char **para_errlist[];
 	PARA_ERROR(BAD_CONFIG, "syntax error in config file"), \
 	PARA_ERROR(CLIENT_AUTH, "authentication failed"), \
 	PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \
+	PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \
+	PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \
 
 
 #define SCHED_ERRORS \
@@ -352,7 +386,8 @@ extern const char **para_errlist[];
 	PARA_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \
 	PARA_ERROR(ATOI_JUNK_AT_END, "further characters after number"), \
 	PARA_ERROR(SIZE_PREFIX, "bad size prefix"), \
-	PARA_ERROR(REGEX, "regular expression error") \
+	PARA_ERROR(REGEX, "regular expression error"), \
+	PARA_ERROR(ARG_NOT_FOUND, "argument not found in arg vector"), \
 
 
 #define EXEC_ERRORS \
@@ -431,6 +466,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_AUTH, "authentication failure"), \
 
 
@@ -466,6 +502,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 */