X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=301e2ca5e1ae36a045a044d8f69c072e82c62a88;hp=08b309ce398d8375c334eb420d6e94408a223189;hb=ba788dd38a53b29c8d573d8e78da4a8e5723a0a9;hpb=6eab6671f857009b6d6a2de2c2ec8187f869f705

diff --git a/error.h b/error.h
index 08b309ce..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
@@ -44,15 +44,11 @@ extern const char **para_errlist[];
 	PARA_ERROR(SYNC_COMPLETE, "all buddies in sync"), \
 	PARA_ERROR(SYNC_LISTEN_FD, "no fd to listen on"), \
 
-#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 \
@@ -83,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"), \