X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=error.h;h=583d2ce510bc3b3a7f617e35daf2e44a5c972de1;hb=67f005d3ea1afbc498feddb70977f4c8252351e0;hp=478aec1f01001c6e0824f4ff9194b7a27bbcc8ed;hpb=a4dbed1c3c7fb8b1b334aa62edcd8d673b3d18b2;p=paraslash.git

diff --git a/error.h b/error.h
index 478aec1f..583d2ce5 100644
--- a/error.h
+++ b/error.h
@@ -58,6 +58,8 @@ enum para_subsystem {
 	SS_DCCP_SEND,
 	SS_FD,
 	SS_GUI,
+	SS_PLAY,
+	SS_ALSA,
 	SS_RINGBUFFER};
 
 #define NUM_SS (SS_RINGBUFFER + 1)
@@ -292,9 +294,36 @@ extern const char **para_errlist[];
 
 #define FD_ERRORS \
 	PARA_ERROR(F_GETFL, "failed to get fd flags"), \
-	PARA_ERROR(F_SETFL, "failed to set 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
@@ -414,6 +443,8 @@ 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