open_and_update_audio_file(): Interchange two arguments.

[paraslash.git] / afs.h

diff --git a/afs.h b/afs.h
index 46f3b2fbbd332549027e0e5d73348a511ea3a5c9..7aea5cb28950305252deddfe37e9c40fde88fa92 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -108,14 +108,19 @@ 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 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;
 };
 
@@ -194,8 +199,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);