REQUIREMENTS: Kill an incomplete sentence, add git.

[paraslash.git] / afs.h

diff --git a/afs.h b/afs.h
index 9e1f61e07bd0ef255911eb80ac48b4c93f4651c8..f15b8c559bf8b442674e42409bc0fcea8b65930a 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -90,13 +90,37 @@ struct afs_table {
 
 enum play_mode {PLAY_MODE_MOOD, PLAY_MODE_PLAYLIST};
 
+/**
+ * Data about one audio file.
+ *
+ * Needed to produce ls and stat output.
+ */
+struct ls_data {
+       /** Usual audio format handler information. */
+       struct afh_info afhi;
+       /** Audio file selector information. */
+       struct afs_info afsi;
+       /** The full path of the audio file. */
+       char *path;
+       /** The score value (if -a was given). */
+       long score;
+       /** The sha1 hash of audio file. */
+       HASH_TYPE *hash;
+};
+int make_status_items(struct ls_data *d, struct para_buffer *pb);
+void make_empty_status_items(char *buf);
+
+#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];
+       /* 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;
 };
 
@@ -175,7 +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);
+int open_and_update_audio_file(struct osl_row *aft_row,
+       struct audio_file_data *afd, long score);
 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);
@@ -198,7 +223,6 @@ int mood_check_callback(__a_unused const struct osl_object *query,
 /* playlist */
 int playlist_open(char *name);
 void playlist_close(void);
-int playlist_update_audio_file(struct osl_row *aft_row);
 int playlist_check_callback(__a_unused const struct osl_object *query,
        struct osl_object *result);