X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=623cd1453b26d16c38f3b70b97bd0c2bdc5802b9;hp=801347208136b7089744921310fee6d11e81a829;hb=dabdb25fd7fe411933d3639f71a8148b5dc29630;hpb=191d16070b9511f5b32b1ede7a9d0db1ffb3da54

diff --git a/afs.h b/afs.h
index 80134720..623cd145 100644
--- a/afs.h
+++ b/afs.h
@@ -99,7 +99,7 @@ int send_standard_callback_request(int argc, char * const * const argv,
 int send_option_arg_callback_request(struct osl_object *options,
 	int argc, char * const * const argv, callback_function *f,
 	struct osl_object *result);
-int stdin_command(struct osl_object *arg_obj, callback_function *f,
+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 para_atol(const char *str, long *result);
@@ -122,7 +122,7 @@ int row_belongs_to_score_table(const struct osl_row *aft_row);
 /* attribute */
 int attribute_init(struct table_info *ti, const char *db);
 void attribute_shutdown(enum osl_close_flags flags);
-void get_attribute_bitmap(uint64_t *atts, char *buf);
+void get_attribute_bitmap(const uint64_t *atts, char *buf); /* needed by com_ls() */
 int get_attribute_bitnum_by_name(const char *att_name, unsigned char *bitnum);
 int get_attribute_text(uint64_t *atts, const char *delim, char **text);
 
@@ -135,14 +135,15 @@ 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);
 int get_audio_file_path_of_row(const struct osl_row *row, char **path);
-int get_afsi_object_of_row(const void *row, struct osl_object *obj);
+int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj);
 int audio_file_loop(void *private_data, osl_rbtree_loop_func *func);
+int aft_check_callback(const struct osl_object *query, struct osl_object *result);
 
 /* mood */
-int mood_open(char *mood_name);
-void mood_close(void);
+int change_current_mood(char *mood_name);
+void close_current_mood(void);
 int mood_update_audio_file(const struct osl_row *aft_row, struct afs_info *old_afsi);
-int mood_reload(void);
+int reload_current_mood(void);
 int mood_delete_audio_file(const struct osl_row *aft_row);
 
 
@@ -150,6 +151,8 @@ int mood_delete_audio_file(const struct osl_row *aft_row);
 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);
 
 /** evaluates to 1 if x < y, to -1 if x > y and to 0 if x == y */
 #define NUM_COMPARE(x, y) ((int)((x) < (y)) - (int)((x) > (y)))