X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=9563303fabf9e3aca1556f34180a50753ca9d16e;hp=89dbb0f69f1ffa984f740fa8b7a0e3b5d24d035b;hb=0a2aa419ef9fcdb667ebcbe1a425802578aa153d;hpb=c839ef92e35d5604748aa4674b400156ff7baced

diff --git a/error.h b/error.h
index 89dbb0f6..9563303f 100644
--- a/error.h
+++ b/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
  *     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
@@ -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,18 @@ 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"), \
+	PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
+
+
+#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"), \
 
 
@@ -293,7 +300,7 @@ 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"), \
 
@@ -320,7 +327,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 +360,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 +400,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 \
@@ -406,7 +412,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 +432,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"), \
@@ -546,7 +552,7 @@ 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);
@@ -562,13 +568,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 */