X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=0f83398e7aae6333446ee45555a0fd91879e152f;hp=3b31d82e529e7fb84955d4d2f2498a72812e709e;hb=849c979d89d3062dd9a27c2e43ed08a573759659;hpb=c5fa571f434b45ab8f786cf20e8c22d197a00da2 diff --git a/error.h b/error.h index 3b31d82e..0f83398e 100644 --- a/error.h +++ b/error.h @@ -71,9 +71,9 @@ enum para_subsystem { SS_FD, SS_WRITE, SS_WRITE_COMMON, - SS_ALSA_WRITER, - SS_FILE_WRITER, - SS_OSX_WRITER, + SS_ALSA_WRITE, + SS_FILE_WRITE, + SS_OSX_WRITE, NUM_SS }; @@ -94,12 +94,13 @@ enum para_subsystem { extern const char **para_errlist[]; /** \endcond */ -#define OSX_WRITER_ERRORS \ +#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"), \ @@ -407,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"), \ @@ -427,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"), \ @@ -563,9 +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(OSX_WRITER); +SS_ENUM(ALSA_WRITE); +SS_ENUM(FILE_WRITE); +SS_ENUM(OSX_WRITE); SS_ENUM(RINGBUFFER); SS_ENUM(CLIENT); SS_ENUM(CLIENT_COMMON);