X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=977fc40b6591dd778294ce7a796a6edcb4746f18;hp=b16f32ced38440fafb3a068e502341aa6ca57a0e;hb=2bb9fcbfa99cf30a6f46ba33fd95c0a456a225cc;hpb=8769ef42c84de55cea4cd6820802e8b8f53393c8

diff --git a/afs.h b/afs.h
index b16f32ce..977fc40b 100644
--- a/afs.h
+++ b/afs.h
@@ -108,22 +108,25 @@ 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
+#define VERBOSE_LS_OUTPUT_SIZE 4096
 
+/*
+ * Data about the current audio file, passed from afs to server.
+ */
 struct audio_file_data {
-	enum play_mode current_play_mode;
-	char attributes_string[MAXLINE];
-	char path[_POSIX_PATH_MAX];
-	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;
-	long score;
-	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
 };
 
@@ -197,7 +200,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);
+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);