X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=ca172cb4032bc0e624b7122fdc26281161e10f4c;hp=3100b31299b3064fb47875bdbef971425e02fd11;hb=1775d4d4147730e79e48aa941aee88580b8beb08;hpb=01a7db579a518a1a03b940a5a42411e49123ac1b

diff --git a/error.h b/error.h
index 3100b312..ca172cb4 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,21 +29,41 @@ 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
 
 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"), \
@@ -62,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?)"), \
@@ -475,6 +499,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 */