X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=873ce28036442b31f2d72f9c8c811cbad928b1e3;hp=4570e19442115540b6187f7ae2b2f648e4437f37;hb=273756ef36a4090d2c702e14b1ee30ca245186e8;hpb=cad2842e228ab3e42702a05af759ad292b89bed9

diff --git a/error.h b/error.h
index 4570e194..873ce280 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.
  */
@@ -34,24 +34,50 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define STDIN_ERRORS
 #define WRITE_ERRORS
 #define CHECK_WAV_ERRORS
-#define RESAMPLE_FILTER_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 OPUS_COMMON_ERRORS \
+	PARA_ERROR(OPUS_HEADER, "invalid opus header"), \
+
+
+#define OPUS_AFH_ERRORS \
+	PARA_ERROR(OPUS_COMMENT, "invalid or corrupted opus comment"), \
+
+
+#define OPUSDEC_FILTER_ERRORS \
+	PARA_ERROR(CREATE_OPUS_DECODER, "could not create opus decoder"), \
+	PARA_ERROR(OPUS_SET_GAIN, "opus: could not set gain"), \
+	PARA_ERROR(OPUS_DECODE, "opus decode 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"), \
@@ -70,6 +96,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?)"), \
@@ -483,6 +513,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 */