X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=1db656b95dbe1413330b76fcea93f63ebff6bae2;hb=8dec140ed06a2c35a13336fec95b77b28b6b7b96;hp=ef54ef27707e262a09c7b638c8264cec549b2c1e;hpb=c3c862adf34ad3e504c18c5b2186fe98d4e7edd2;p=paraslash.git

diff --git a/error.h b/error.h
index ef54ef27..1db656b9 100644
--- a/error.h
+++ b/error.h
@@ -28,7 +28,7 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define GGO_ERRORS
 #define COLOR_ERRORS
 #define SIGNAL_ERRORS
-#define FADE_ERRORS
+#define OSS_MIX_ERRORS
 #define STDOUT_ERRORS
 #define FILE_WRITE_ERRORS
 #define STDIN_ERRORS
@@ -39,15 +39,11 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 
 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"), \
+	PARA_ERROR(ALSA_MIX_RANGE, "value control element out of range"), \
 
 
 #define RESAMPLE_FILTER_ERRORS \
@@ -78,6 +74,8 @@ extern const char **para_errlist[];
 	PARA_ERROR(NO_VALID_FILES, "no valid file found in playlist"), \
 	PARA_ERROR(BAD_PLAY_CMD, "invalid command"), \
 
+#define FADE_ERRORS \
+	PARA_ERROR(BAD_CHANNEL, "invalid channel"), \
 
 #define FLACDEC_FILTER_ERRORS \
 	PARA_ERROR(FLACDEC_DECODER_ALLOC, "could not allocate stream decoder"), \
@@ -301,6 +299,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 NET_ERRORS \
@@ -337,6 +336,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(UNSUPPORTED_AUDIO_FORMAT, "given audio format not supported"), \
 	PARA_ERROR(NOT_PLAYING, "not playing"), \
 	PARA_ERROR(AUDIOD_OFF, "audiod switched off"), \
+	PARA_ERROR(STATUS_TIMEOUT, "status item timeout"), \
 
 
 #define AUDIOD_COMMAND_ERRORS \
@@ -464,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"), \
 
 
@@ -607,7 +607,7 @@ _static_inline_ const char *para_strerror(int num)
  *
  * This should be used for all calls to osl functions that return an osl error
  * code. It changes the return value appropriately so that it can be used for
- * printing the correct error message vi para_strerror().
+ * printing the correct error message with para_strerror().
  *
  * \return \a ret if \a ret >= 0, a paraslash error code otherwise.
  */