X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=335950b76b5c949a3be38a7f1e9c74d68e513f3d;hp=0c4a05f41dc6f72aee850fa7e1f91f7446b55a14;hb=54096edf9b0254303dfee9d8f87d2f2f0b17fcce;hpb=730cb7dd464355316ee30846a3d2e91f22b4f7e1

diff --git a/error.h b/error.h
index 0c4a05f4..335950b7 100644
--- a/error.h
+++ b/error.h
@@ -23,8 +23,10 @@ enum para_subsystem {SS_RECV,
 	SS_NET, SS_ORTP_RECV, SS_AUDIOD, SS_EXEC, SS_CLOSE_ON_FORK, SS_SIGNAL,
 	SS_STRING, SS_DAEMON, SS_STAT, SS_TIME, SS_GRAB_CLIENT, SS_HTTP_RECV,
 	SS_RECV_COMMON, SS_FILTER_CHAIN, SS_WAV, SS_COMPRESS, SS_OGGDEC, SS_FILTER,
-	SS_COMMAND, SS_RANDOM_DBTOOL, SS_PLM_DBTOOL, SS_CRYPT, SS_HTTP_SEND, SS_ORTP_SEND, SS_DB, SS_OGG,
-	SS_MP3, SS_MP3DEC, SS_SERVER, SS_AFS, SS_MYSQL, SS_IPC, SS_RINGBUFFER};
+	SS_COMMAND, SS_RANDOM_SELECTOR, SS_PLAYLIST_SELECTOR, SS_CRYPT,
+	SS_HTTP_SEND, SS_ORTP_SEND, SS_DB, SS_OGG,
+	SS_MP3, SS_MP3DEC, SS_SERVER, SS_AFS, SS_MYSQL_SELECTOR,
+	SS_IPC, SS_RINGBUFFER};
 #define NUM_SS (SS_RINGBUFFER + 1)
 extern const char **para_errlist[];
 /** \endcond */
@@ -185,12 +187,12 @@ extern const char **para_errlist[];
 	PARA_ERROR(WRITE_OK, "can not check whether fd is writable"), \
 
 
-#define RANDOM_DBTOOL_ERRORS \
+#define RANDOM_SELECTOR_ERRORS \
 	PARA_ERROR(FILE_COUNT, "audio file count exceeded"), \
 	PARA_ERROR(NOTHING_FOUND, "no audio files found"), \
 
 
-#define MYSQL_ERRORS \
+#define MYSQL_SELECTOR_ERRORS \
 	PARA_ERROR(MYSQL_SYNTAX, "mysql syntax error"), \
 	PARA_ERROR(NOTCONN, "not connected to mysql server"), \
 	PARA_ERROR(TOOBIG, "mysql: file too large"), \
@@ -215,7 +217,7 @@ extern const char **para_errlist[];
 #define COMMAND_ERRORS \
 	PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \
 	PARA_ERROR(AUTH, "did not receive auth request"), \
-	PARA_ERROR(BAD_DBTOOL, "no such database tool"), \
+	PARA_ERROR(BAD_SELECTOR, "no such audio file selector"), \
 	PARA_ERROR(NO_AUDIO_FILE, "no audio file"), \
 	PARA_ERROR(BAD_CMD, "invalid command"), \
 	PARA_ERROR(PERM, "permission denied"), \
@@ -224,7 +226,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(LOCK, "lock error"), \
 	PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \
 
-#define PLM_DBTOOL_ERRORS \
+#define PLAYLIST_SELECTOR_ERRORS \
 	PARA_ERROR(LOAD_PLAYLIST, "failed to load playlist"), \
 
 
@@ -233,6 +235,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(SEM_REMOVE, "can not remove semaphore"), \
 	PARA_ERROR(SHM_GET, "failed to allocate shared memory area"), \
 	PARA_ERROR(SHM_DESTROY, "failed to destroy shared memory area"), \
+	PARA_ERROR(SHM_ATTACH, "can not attach shared memory area"), \
 	PARA_ERROR(SHM_DETACH, "can not detach shared memory area"), \
 
 /* these do not need error handling (yet) */
@@ -341,13 +344,13 @@ SS_ENUM(OGG);
 SS_ENUM(SERVER);
 SS_ENUM(AFS);
 SS_ENUM(COMMAND);
-SS_ENUM(RANDOM_DBTOOL);
-SS_ENUM(PLM_DBTOOL);
+SS_ENUM(RANDOM_SELECTOR);
+SS_ENUM(PLAYLIST_SELECTOR);
 SS_ENUM(CRYPT);
 SS_ENUM(HTTP_SEND);
 SS_ENUM(ORTP_SEND);
 SS_ENUM(DB);
-SS_ENUM(MYSQL);
+SS_ENUM(MYSQL_SELECTOR);
 SS_ENUM(IPC);
 SS_ENUM(RINGBUFFER);
 /** \endcond */