afs.h: Fix typo in comment.

[paraslash.git] / afs.h

diff --git a/afs.h b/afs.h
index f9a44893db741e5ac7eabb9d52175c804d2f75bd..4c171a8e08f2d3c91c1055363c9a457d09d98b30 100644 (file)
--- 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,21 +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 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
 };
 
@@ -196,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);
@@ -255,7 +260,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, \