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

diff --git a/error.h b/error.h
index 08b309ce..28ac9552 100644
--- a/error.h
+++ b/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -16,11 +16,9 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define TIME_ERRORS
 #define CLOSE_ON_FORK_ERRORS
 #define DAEMON_ERRORS
-#define GUI_ERRORS
 #define GUI_THEME_ERRORS
 #define RINGBUFFER_ERRORS
 #define SCORE_ERRORS
-#define RBTREE_ERRORS
 #define RECV_ERRORS
 #define IPC_ERRORS
 #define DCCP_SEND_ERRORS
@@ -28,7 +26,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 +42,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,12 +77,16 @@ 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"), \
 	PARA_ERROR(FLACDEC_DECODER_INIT, "could not init stream decoder"), \
 	PARA_ERROR(FLACDEC_EOF, "flacdec encountered end of file condition"), \
 
+#define GUI_ERRORS \
+	PARA_ERROR(GUI_SIGCHLD, "received SIGCHLD"), \
 
 #define FLAC_AFH_ERRORS \
 	PARA_ERROR(FLAC_CHAIN_ALLOC, "could not create metadata chain"), \
@@ -163,7 +161,6 @@ extern const char **para_errlist[];
 
 
 #define PREBUFFER_FILTER_ERRORS \
-	PARA_ERROR(PREBUFFER_SYNTAX, "syntax error in prebuffer filter config"), \
 	PARA_ERROR(PREBUFFER_SUCCESS, "prebuffering complete"), \
 
 
@@ -183,6 +180,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(AO_PLAY, "ao_play() failed"), \
 	PARA_ERROR(AO_BAD_SAMPLE_FORMAT, "ao: unsigned sample formats not supported"), \
 	PARA_ERROR(AO_PTHREAD, "pthread error"), \
+	PARA_ERROR(AO_EOF, "ao: end of file"), \
 
 
 #define COMPRESS_FILTER_ERRORS \
@@ -211,7 +209,6 @@ extern const char **para_errlist[];
 
 
 #define AMP_FILTER_ERRORS \
-	PARA_ERROR(AMP_SYNTAX, "syntax error in amp filter config"), \
 	PARA_ERROR(AMP_ZERO_AMP, "no amplification necessary"), \
 	PARA_ERROR(AMP_EOF, "amp: end of file"), \
 
@@ -260,7 +257,6 @@ extern const char **para_errlist[];
 
 #define BLOB_ERRORS \
 	PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \
-	PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \
 
 
 #define PLAYLIST_ERRORS \
@@ -270,7 +266,7 @@ extern const char **para_errlist[];
 
 
 #define AFT_ERRORS \
-	PARA_ERROR(BAD_AFSI, "invaiid afs info"), \
+	PARA_ERROR(BAD_AFSI, "invalid afs info"), \
 	PARA_ERROR(LOCALTIME, "localtime() failed"), \
 	PARA_ERROR(STRFTIME, "strftime() failed"), \
 	PARA_ERROR(BAD_PATH, "invalid path"), \
@@ -302,7 +298,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
 	PARA_ERROR(NO_CONFIG, "config file not found"), \
 	PARA_ERROR(BAD_CONFIG, "syntax error in config file"), \
-	PARA_ERROR(CLIENT_AUTH, "authentication failed"), \
 	PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \
 	PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \
 	PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \
@@ -344,6 +339,8 @@ extern const char **para_errlist[];
 	PARA_ERROR(NOT_PLAYING, "not playing"), \
 	PARA_ERROR(AUDIOD_OFF, "audiod switched off"), \
 	PARA_ERROR(STATUS_TIMEOUT, "status item timeout"), \
+	PARA_ERROR(AUDIOD_SIGNAL, "caught deadly signal"), \
+	PARA_ERROR(AUDIOD_TERM, "terminating on user request"), \
 
 
 #define AUDIOD_COMMAND_ERRORS \
@@ -582,7 +579,7 @@ extern const char **para_errlist[];
  * \return True if \a num is paraslash's representation of the system
  * error identified by \a _errno.
  */
-_static_inline_ int is_errno(int num, int _errno)
+_static_inline_ bool is_errno(int num, int _errno)
 {
 	assert(num > 0 && _errno > 0);
 	return ERRNO_TO_PARA_ERROR(_errno) == num;
@@ -627,9 +624,9 @@ _static_inline_ int osl(int ret)
 
 /**
  * Define the error list for one subsystem.
- #
- * The first entry (index 0) is always the name of the subsystem
- * Used by macros in config.h (generated by configure).
+ *
+ * The first entry (index 0) is always the name of the subsystem. Used by
+ * macros in config.h (generated by configure).
  */
 #define DEFINE_ERRLIST(ss) const char * ss ## _ERRLIST[] = {#ss, ss ## _ERRORS}