X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=c7fecd881ef3e9e98daac0ccaa3264d4343dc667;hp=d9fa53c41f587a71d6dc9f82ac78545aba283d54;hb=858cf06b1b89dfa8b561ba270045e8fd5112a808;hpb=192417698d9dab017ef6108fa6e9fd5ea1dc5633

diff --git a/afs.h b/afs.h
index d9fa53c4..c7fecd88 100644
--- a/afs.h
+++ b/afs.h
@@ -66,7 +66,7 @@ struct rmatt_event_data {
 
 
 struct afsi_change_event_data {
-	const struct osl_row *aft_row;
+	struct osl_row *aft_row;
 	struct afs_info *old_afsi;
 };
 
@@ -108,18 +108,26 @@ struct ls_data {
 	HASH_TYPE *hash;
 };
 int make_status_items(struct ls_data *d, struct para_buffer *pb);
+void make_empty_status_items(char *buf);
 
-#define AFS_STATUS_INFO_SIZE 4096
+/** At most that many bytes will be passed from afs to para_server. */
+#define VERBOSE_LS_OUTPUT_SIZE 4096
 
+/*
+ * Data about the current audio file, passed from afs to server.
+ */
 struct audio_file_data {
-	char afs_status_info[AFS_STATUS_INFO_SIZE];
+	/** Same info as ls -lv -p current audio_file. */
+	char verbose_ls_output[VERBOSE_LS_OUTPUT_SIZE];
+	/** The open file descriptor to the current audio file. */
 	int fd;
-	struct afs_info afsi;
+	/** Vss needs this for streaming. */
 	struct afh_info afhi;
 };
 
 enum afs_server_code {
 	NEXT_AUDIO_FILE,
+	NO_ADMISSIBLE_FILES,
 	AFD_CHANGE
 };
 
@@ -154,6 +162,14 @@ struct pattern_match_data {
 };
 
 /* afs */
+/**
+ * Afs command handlers run as a process which is not related to the afs
+ * process, i.e. they can not change the address space of afs directly.
+ * Therefore afs commands typically consist of two functions: The command
+ * handler and the corresponding callback function that runs in afs context.
+ *
+ * \sa send_callback_request().
+ */
 typedef int callback_function(const struct osl_object *, struct osl_object *);
 __noreturn void afs_init(uint32_t cookie, int socket_fd);
 void afs_event(enum afs_events event, struct para_buffer *pb,
@@ -193,8 +209,8 @@ int get_attribute_text(uint64_t *atts, const char *delim, char **text);
 /* aft */
 void aft_init(struct afs_table *t);
 int aft_get_row_of_path(const char *path, struct osl_row **row);
-int open_and_update_audio_file(struct osl_row *aft_row,
-	struct audio_file_data *afd, long score);
+int open_and_update_audio_file(struct osl_row *aft_row, long score,
+	struct audio_file_data *afd);
 int load_afd(int shmid, struct audio_file_data *afd);
 int load_afsi(struct afs_info *afsi, struct osl_object *obj);
 void save_afsi(struct afs_info *afsi, struct osl_object *obj);
@@ -253,7 +269,7 @@ enum blob_table_columns {
 	NUM_BLOB_COLUMNS
 };
 
-/** Define an osl table decription for a blob table. */
+/** Define an osl table description for a blob table. */
 #define DEFINE_BLOB_TABLE_DESC(table_name) \
 	struct osl_table_description table_name ## _table_desc = { \
 		.name = #table_name, \