X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=45485e1df68e65a67a7d3d622ccb124ea311b706;hp=89dbb0f69f1ffa984f740fa8b7a0e3b5d24d035b;hb=e9656de3ac6d281f585e5a60629d13631c569ae3;hpb=c715d5c6ec226fe172ef3b8a52ccf769b745594b diff --git a/error.h b/error.h index 89dbb0f6..45485e1d 100644 --- a/error.h +++ b/error.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Andre Noll + * Copyright (C) 2006-2007 Andre Noll * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -55,7 +55,7 @@ enum para_subsystem { SS_CRYPT, SS_HTTP_SEND, SS_ORTP_SEND, - SS_DB, + SS_AFS, SS_OGG_AFH, SS_MP3_AFH, SS_AAC_AFH, @@ -63,7 +63,7 @@ enum para_subsystem { SS_AACDEC, SS_AAC_COMMON, SS_SERVER, - SS_AFS, + SS_VSS, SS_MYSQL_SELECTOR, SS_IPC, SS_DCCP, @@ -71,9 +71,10 @@ 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, + SS_USER_LIST, NUM_SS }; @@ -94,12 +95,17 @@ enum para_subsystem { extern const char **para_errlist[]; /** \endcond */ -#define OSX_WRITER_ERRORS \ +#define USER_LIST_ERRORS \ + PARA_ERROR(USERLIST, "failed to open user list file"), \ + + +#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"), \ @@ -196,6 +202,7 @@ extern const char **para_errlist[]; PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \ PARA_ERROR(UCRED_PERM, "permission denied"), \ PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \ + PARA_ERROR(BAD_USER, "you don't exist. Go away."), \ #define FILTER_CHAIN_ERRORS \ @@ -257,8 +264,6 @@ extern const char **para_errlist[]; #define MP3_AFH_ERRORS \ - PARA_ERROR(FREAD, "fread error"), \ - PARA_ERROR(FSEEK, "fseek error"), \ PARA_ERROR(FRAME, "invalid mp3 frame"), \ PARA_ERROR(FRAME_LENGTH, "invalid frame length"), \ PARA_ERROR(MP3_NO_FILE, "invalid mp3 file pointer"), \ @@ -293,12 +298,13 @@ extern const char **para_errlist[]; PARA_ERROR(OGG_REPOS, "ogg repositioning error"), \ -#define AFS_ERRORS \ +#define VSS_ERRORS \ PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \ PARA_ERROR(FSTAT, "failed to fstat() audio file"), \ + PARA_ERROR(EMPTY_CHUNK, "empty chunk"), \ -#define DB_ERRORS \ +#define AFS_ERRORS \ PARA_ERROR(GETCWD, "can not get current working directory"), \ PARA_ERROR(CHDIR, "can not change directory"), \ PARA_ERROR(OPENDIR, "can not open directory"), \ @@ -320,7 +326,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"), \ @@ -354,10 +359,9 @@ extern const char **para_errlist[]; PARA_ERROR(NO_AUDIO_FILE, "no audio file"), \ PARA_ERROR(BAD_CMD, "invalid command"), \ PARA_ERROR(PERM, "permission denied"), \ - PARA_ERROR(USERLIST, "failed to open user list file"), \ - 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 \ @@ -395,6 +399,9 @@ 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"), \ + PARA_ERROR(FSEEK, "fseek error"), \ + PARA_ERROR(FREAD, "fread error"), \ #define WRITE_ERRORS \ @@ -406,7 +413,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"), \ @@ -426,7 +433,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"), \ @@ -512,7 +519,7 @@ extern const char **para_errlist[]; */ #define PARA_ERROR(err, msg) E_ ## err -#define SS_NAME(ss) para_errlist[ss]? para_errlist[ss][0] : "" +// #define SS_NAME(ss) para_errlist[ss]? para_errlist[ss][0] : "" /** \cond popcorn time */ SS_ENUM(GUI); @@ -546,14 +553,14 @@ SS_ENUM(OGG_AFH); SS_ENUM(AAC_AFH); SS_ENUM(AAC_COMMON); SS_ENUM(SERVER); -SS_ENUM(AFS); +SS_ENUM(VSS); SS_ENUM(COMMAND); SS_ENUM(RANDOM_SELECTOR); SS_ENUM(PLAYLIST_SELECTOR); SS_ENUM(CRYPT); SS_ENUM(HTTP_SEND); SS_ENUM(ORTP_SEND); -SS_ENUM(DB); +SS_ENUM(AFS); SS_ENUM(MYSQL_SELECTOR); SS_ENUM(IPC); SS_ENUM(DCCP); @@ -562,13 +569,14 @@ 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); SS_ENUM(AUDIOC); +SS_ENUM(USER_LIST); /** \endcond */ #undef PARA_ERROR /* rest of the world only sees the error text */