X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=477baadf1c30c352f08b1ffa5439e5a4b7b9e8a4;hp=5dd750a748edea7b22c378948d29a9a09dc843a8;hb=3f4c28d4d449efc054e02b9693eaeac9df3c3604;hpb=d041f4528426640d73d141cec7fd2576f7e8be84

diff --git a/error.h b/error.h
index 5dd750a7..477baadf 100644
--- a/error.h
+++ b/error.h
@@ -34,6 +34,7 @@ enum para_subsystem {
 	SS_NET,
 	SS_ORTP_RECV,
 	SS_AUDIOD,
+	SS_AUDIOD_COMMAND,
 	SS_EXEC,
 	SS_STDIN,
 	SS_STDOUT,
@@ -70,6 +71,7 @@ enum para_subsystem {
 	SS_WRITE_COMMON,
 	SS_ALSA_WRITER,
 	SS_FILE_WRITER,
+	SS_OSX_WRITER,
 	NUM_SS
 };
 
@@ -89,6 +91,15 @@ enum para_subsystem {
 extern const char **para_errlist[];
 /** \endcond */
 
+#define OSX_WRITER_ERRORS \
+	PARA_ERROR(STREAM_FORMAT, "could not set stream format"), \
+	PARA_ERROR(ADD_CALLBACK, "can not add callback"), \
+	PARA_ERROR(READ_STDIN, "failed to read from stdin"), \
+	PARA_ERROR(OPEN_COMP, "OpenAComponent() error"), \
+	PARA_ERROR(UNIT_INIT, "AudioUnitInitialize() error"), \
+	PARA_ERROR(DEFAULT_COMP, "can not find default audio output component"), \
+
+
 #define CLIENT_ERRORS \
 	PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
 	PARA_ERROR(INVALID_CHALLENGE, "did not receive valid challenge"), \
@@ -159,11 +170,14 @@ extern const char **para_errlist[];
 	PARA_ERROR(NO_MORE_SLOTS, "no more empty slots"), \
 	PARA_ERROR(MISSING_COLON, "syntax error: missing colon"), \
 	PARA_ERROR(UNSUPPORTED_AUDIO_FORMAT, "given audio format not supported"), \
+	PARA_ERROR(STATUS_EOF, "server closed status connection"), \
+
+
+#define AUDIOD_COMMAND_ERRORS \
 	PARA_ERROR(CLIENT_WRITE, "client write error"), \
+	PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \
 	PARA_ERROR(UCRED_PERM, "permission denied"), \
 	PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \
-	PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \
-	PARA_ERROR(STATUS_EOF, "server closed status connection"), \
 
 
 #define FILTER_CHAIN_ERRORS \
@@ -495,6 +509,7 @@ SS_ENUM(ORTP_RECV);
 SS_ENUM(NET);
 SS_ENUM(RECV);
 SS_ENUM(AUDIOD);
+SS_ENUM(AUDIOD_COMMAND);
 SS_ENUM(EXEC);
 SS_ENUM(SIGNAL);
 SS_ENUM(STRING);
@@ -531,6 +546,7 @@ SS_ENUM(WRITE);
 SS_ENUM(WRITE_COMMON);
 SS_ENUM(ALSA_WRITER);
 SS_ENUM(FILE_WRITER);
+SS_ENUM(OSX_WRITER);
 SS_ENUM(RINGBUFFER);
 SS_ENUM(CLIENT);
 /** \endcond */