Merge /home/maan/scm/paraslash.fml/paraslash

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 706dea9e526f468a187be4a75f2bba50226db23e..05efb790aab78184c58e23829603270e41392ca6 100644 (file)
--- a/error.h
+++ b/error.h
@@ -71,8 +71,9 @@ 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
 };
 
@@ -93,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"), \
@@ -310,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"), \
 
 
@@ -386,6 +396,7 @@ 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(FGETS, "fgets error"), \
 
 
 #define WRITE_ERRORS \
@@ -397,7 +408,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"), \
@@ -417,7 +428,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"), \
@@ -553,8 +564,9 @@ 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);