X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=583d2ce510bc3b3a7f617e35daf2e44a5c972de1;hp=ceaa6b38b2c6b6102ef6689e9be1d46ec48b6baf;hb=6597f6cdccfd678eca2fecc0ed95dc35039413d9;hpb=f2a7b00cf72104a38733b7bf3add9fb19dd71c93

diff --git a/error.h b/error.h
index ceaa6b38..583d2ce5 100644
--- a/error.h
+++ b/error.h
@@ -57,6 +57,9 @@ enum para_subsystem {
 	SS_DCCP_RECV,
 	SS_DCCP_SEND,
 	SS_FD,
+	SS_GUI,
+	SS_PLAY,
+	SS_ALSA,
 	SS_RINGBUFFER};
 
 #define NUM_SS (SS_RINGBUFFER + 1)
@@ -157,6 +160,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(SIGNAL_SIG_ERR, "signal() retured SIG_ERR"), \
 	PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \
 	PARA_ERROR(WAITPID, "waitpid error"), \
+	PARA_ERROR(SIGNAL_PIPE, "failed to setup signal pipe"), \
 
 
 #define STRING_ERRORS \
@@ -238,6 +242,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(GET_AUDIO_FILE, "can not get current audio file"), \
 	PARA_ERROR(GET_STREAM, "can not get current stream"), \
 	PARA_ERROR(NO_STREAM, "no such stream"), \
+	PARA_ERROR(AUDIO_FILE, "no such audio file"), \
 	PARA_ERROR(GET_QUERY, "can not get query for specified stream"), \
 	PARA_ERROR(TMPFILE, "error while writing temporary file"), \
 	PARA_ERROR(META, "can not get meta data"), \
@@ -287,8 +292,38 @@ extern const char **para_errlist[];
 	PARA_ERROR(DCCP_LISTEN, "dccp listen error"), \
 	PARA_ERROR(DCCP_WRITE, "dccp write error"), \
 
+#define FD_ERRORS \
+	PARA_ERROR(F_GETFL, "failed to get fd flags"), \
+	PARA_ERROR(F_SETFL, "failed to set fd flags"), \
+
+
+#define PLAY_ERRORS \
+	PARA_ERROR(READ_HDR, "failed to read audio file header"), \
+	PARA_ERROR(READ_STDIN, "failed to read from stdin"), \
+	PARA_ERROR(PLAY_SYNTAX, "syntax error"), \
+	PARA_ERROR(BROKEN_CONF, "Broken alsa configuration"), \
+	PARA_ERROR(ACCESS_TYPE, "alsa access type not available"), \
+	PARA_ERROR(SAMPLE_FORMAT, "sample format not available"), \
+	PARA_ERROR(CHANNEL_COUNT, "channels count not available"), \
+	PARA_ERROR(HW_PARAMS, "unable to install hw params"), \
+	PARA_ERROR(SW_PARAMS, "unable to install sw params"), \
+	PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \
+	PARA_ERROR(GET_XFER, "unable to obtain xfer align"), \
+	PARA_ERROR(SET_XFER, "snd_pcm_sw_params_set_xfer_align() failed"), \
+	PARA_ERROR(ALSA_WRITE, "alsa write error"), \
+	PARA_ERROR(PCM_OPEN, "unable to open pcm"), \
+	PARA_ERROR(SND_PCM_INFO, "pcm info error"), \
+	PARA_ERROR(GET_BUFFER_TIME, "snd_pcm_hw_params_get_buffer_time_max() failed"), \
+	PARA_ERROR(SET_BUFFER_TIME, "snd_pcm_hw_params_set_buffer_time_near() failed"), \
+	PARA_ERROR(SET_RATE, "snd_pcm_hw_params_set_rate_near failed"), \
+	PARA_ERROR(START_THRESHOLD, "snd_pcm_sw_params_set_start_threshold() failed"), \
+	PARA_ERROR(STOP_THRESHOLD, "snd_pcm_sw_params_set_stop_threshold() failed"), \
+	PARA_ERROR(ALSA_LOG, "snd_output_stdio_attach() failed"), \
+
+
 
 /* these do not need error handling (yet) */
+#define ALSA_ERRORS
 #define SERVER_ERRORS
 #define WAV_ERRORS
 #define COMPRESS_ERRORS
@@ -296,8 +331,8 @@ extern const char **para_errlist[];
 #define CLOSE_ON_FORK_ERRORS
 #define DAEMON_ERRORS
 #define ORTP_SEND_ERRORS
+#define GUI_ERRORS
 #define RINGBUFFER_ERRORS
-#define FD_ERRORS
 
 
 /**
@@ -407,6 +442,9 @@ SS_ENUM(DCCP);
 SS_ENUM(DCCP_RECV);
 SS_ENUM(DCCP_SEND);
 SS_ENUM(FD);
+SS_ENUM(GUI);
+SS_ENUM(PLAY);
+SS_ENUM(ALSA);
 SS_ENUM(RINGBUFFER);
 /** \endcond */
 #undef PARA_ERROR