Get rid of mmd->filename.

[paraslash.git] / afs.h

diff --git a/afs.h b/afs.h
index db931d989133a53a82ae38c07bbe75aeb581e5a6..b5e9d56b2764e4befd5573f7d7c84062fab2df7a 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -72,11 +72,17 @@ enum play_mode {PLAY_MODE_MOOD, PLAY_MODE_PLAYLIST};
 
 struct audio_file_data {
        enum play_mode current_play_mode;
+       char attributes_string[MAXLINE];
+       char path[_POSIX_PATH_MAX];
+       int fd;
        long score;
        struct afs_info afsi;
        struct audio_format_info afhi;
-       char *path;
-       struct osl_object map;
+};
+
+enum afs_server_code {
+       NEXT_AUDIO_FILE,
+       AFD_CHANGE
 };
 
 /** Flags passed to for_each_matching_row(). */
@@ -124,7 +130,6 @@ int send_option_arg_callback_request(struct osl_object *options,
 int stdin_command(int fd, struct osl_object *arg_obj, callback_function *f,
                unsigned max_len, struct osl_object *result);
 int string_compare(const struct osl_object *obj1, const struct osl_object *obj2);
-int open_next_audio_file(struct audio_file_data *afd);
 int close_audio_file(struct audio_file_data *afd);
 int for_each_matching_row(struct pattern_match_data *pmd);
 
@@ -151,6 +156,7 @@ int get_attribute_text(uint64_t *atts, const char *delim, char **text);
 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 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);
 int get_afsi_of_row(const struct osl_row *row, struct afs_info *afsi);
@@ -163,6 +169,7 @@ int aft_check_callback(const struct osl_object *query, struct osl_object *result
 
 /* mood */
 int change_current_mood(char *mood_name);
+void close_current_mood(void);
 int reload_current_mood(void);
 int mood_check_callback(__a_unused const struct osl_object *query,
        struct osl_object *result);
@@ -170,6 +177,7 @@ 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);