X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=301e2ca5e1ae36a045a044d8f69c072e82c62a88;hp=51ace98315ed6140ec8bbde35c1c36d5649c3d46;hb=eb8ac00d795be355154f237d7e29f8ecf9999846;hpb=77a0aff9b99cc7cfb6fef28a633300bf709a8d47

diff --git a/error.h b/error.h
index 51ace983..301e2ca5 100644
--- a/error.h
+++ b/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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
@@ -37,17 +37,18 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define VERSION_ERRORS
 #define SCHED_ERRORS
 
-extern const char **para_errlist[];
 
-#define OSS_MIX_ERRORS \
-	PARA_ERROR(OSS_MIXER_CHANNEL, "invalid mixer channel"), \
+extern const char **para_errlist[];
 
+#define SYNC_FILTER_ERRORS\
+	PARA_ERROR(SYNC_COMPLETE, "all buddies in sync"), \
+	PARA_ERROR(SYNC_LISTEN_FD, "no fd to listen on"), \
 
 #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 +79,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"), \
@@ -338,6 +341,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 \
@@ -608,7 +612,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.
  */