X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=cb5e2b023bfda5d8759bc594a0b559fabf0b42a7;hp=7d10ff23a4cf10d7d57bd44c6234230dce97bd7c;hb=67cccf4883d30aded54d5d6d748479d800bad3ef;hpb=e1dfa207b2f03e2c06ccfdc6c1c68598703ba4d1

diff --git a/error.h b/error.h
index 7d10ff23..cb5e2b02 100644
--- a/error.h
+++ b/error.h
@@ -20,6 +20,7 @@
 
 /** \cond list of all subsystems that support the shiny error facility */
 enum para_subsystem {
+	SS_CLIENT,
 	SS_GUI,
 	SS_TIME,
 	SS_WAV,
@@ -31,7 +32,7 @@ enum para_subsystem {
 	SS_RECV,
 	SS_NET,
 	SS_ORTP_RECV,
-	SS_CLIENT,
+	SS_CLIENT_COMMON,
 	SS_AUDIOC,
 	SS_SCHED,
 	SS_AUDIOD,
@@ -70,13 +71,15 @@ enum para_subsystem {
 	SS_FD,
 	SS_WRITE,
 	SS_WRITE_COMMON,
-	SS_ALSA_WRITER,
-	SS_FILE_WRITER,
+	SS_ALSA_WRITE,
+	SS_FILE_WRITE,
+	SS_OSX_WRITE,
 	NUM_SS
 };
 
 /* these do not need error handling (yet) */
 #define SERVER_ERRORS
+#define CLIENT_ERRORS
 #define WAV_ERRORS
 #define COMPRESS_ERRORS
 #define TIME_ERRORS
@@ -91,6 +94,16 @@ enum para_subsystem {
 extern const char **para_errlist[];
 /** \endcond */
 
+#define OSX_WRITE_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(UNIT_START, "AudioUnitStart() error"), \
+	PARA_ERROR(DEFAULT_COMP, "can not find default audio output component"), \
+
+
 #define AUDIOC_ERRORS \
 	PARA_ERROR(AUDIOC_SYNTAX, "audioc syntax error"), \
 	PARA_ERROR(AUDIOC_READ, "audioc read error"), \
@@ -100,16 +113,22 @@ extern const char **para_errlist[];
 	PARA_ERROR(AUDIOC_OVERRUN, "audioc buffer overrun"), \
 
 
-#define CLIENT_ERRORS \
+
+
+#define CLIENT_COMMON_ERRORS \
 	PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
 	PARA_ERROR(INVALID_CHALLENGE, "did not receive valid challenge"), \
-	PARA_ERROR(CLIENT_AUTH, "authentication failed"), \
-	PARA_ERROR(SHORT_CLIENT_WRITE, "short client write"), \
 	PARA_ERROR(NO_CONFIG, "config file not found"), \
+	PARA_ERROR(CLIENT_AUTH, "authentication failed"), \
+	PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \
+	PARA_ERROR(INPUT_EOF, "end of input"), \
+	PARA_ERROR(HANDSHAKE_COMPLETE, ""), /* not really an error */ \
+
 
 #define SCHED_ERRORS \
 	PARA_ERROR(TASK_KILLED, "task killed"), \
 	PARA_ERROR(NO_SUCH_TASK, "task not found"), \
+	PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \
 
 
 #define STDIN_ERRORS \
@@ -302,7 +321,6 @@ extern const char **para_errlist[];
 
 
 #define RANDOM_SELECTOR_ERRORS \
-	PARA_ERROR(FILE_COUNT, "audio file count exceeded"), \
 	PARA_ERROR(NOTHING_FOUND, "no audio files found"), \
 
 
@@ -340,6 +358,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
 	PARA_ERROR(LOCK, "lock error"), \
 	PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \
+	PARA_ERROR(SERVER_CRASH, "para_server crashed -- can not live without it"), \
 
 
 #define PLAYLIST_SELECTOR_ERRORS \
@@ -388,7 +407,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(DELAY_TIMEOUT, "initial delay timeout"), \
 
 
-#define ALSA_WRITER_ERRORS \
+#define ALSA_WRITE_ERRORS \
 	PARA_ERROR(BROKEN_CONF, "Broken alsa configuration"), \
 	PARA_ERROR(ACCESS_TYPE, "alsa access type not available"), \
 	PARA_ERROR(SAMPLE_FORMAT, "sample format not available"), \
@@ -408,7 +427,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(STOP_THRESHOLD, "snd_pcm_sw_params_set_stop_threshold() failed"), \
 
 
-#define FILE_WRITER_ERRORS \
+#define FILE_WRITE_ERRORS \
 	PARA_ERROR(FW_WRITE, "file writer write error"), \
 	PARA_ERROR(FW_OPEN, "file writer: can not open output file"), \
 	PARA_ERROR(FW_NO_FILE, "task started without open file"), \
@@ -544,10 +563,12 @@ SS_ENUM(DCCP_SEND);
 SS_ENUM(FD);
 SS_ENUM(WRITE);
 SS_ENUM(WRITE_COMMON);
-SS_ENUM(ALSA_WRITER);
-SS_ENUM(FILE_WRITER);
+SS_ENUM(ALSA_WRITE);
+SS_ENUM(FILE_WRITE);
+SS_ENUM(OSX_WRITE);
 SS_ENUM(RINGBUFFER);
 SS_ENUM(CLIENT);
+SS_ENUM(CLIENT_COMMON);
 SS_ENUM(AUDIOC);
 /** \endcond */
 #undef PARA_ERROR