X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.h;h=efd7fbacf61d1bea136e7162c14407c66b457b82;hb=bb94ae9d3364ac5e868bc0f979854ccea222963c;hp=88b891c829d835efcef315ff8e5aa8fd1b725353;hpb=68630d8b55d688a7c7ce116951c310150aa9c166;p=paraslash.git diff --git a/afs.h b/afs.h index 88b891c8..efd7fbac 100644 --- a/afs.h +++ b/afs.h @@ -166,7 +166,7 @@ struct pattern_match_data { * * \sa send_callback_request(). */ -typedef void callback_function(int fd, const struct osl_object *); +typedef int callback_function(int fd, const struct osl_object *); /** * Callbacks send chunks to data back to the command handler. Pointers to @@ -223,6 +223,7 @@ int send_standard_callback_request(int argc, char * const * const argv, void *private_result_data); int string_compare(const struct osl_object *obj1, const struct osl_object *obj2); int for_each_matching_row(struct pattern_match_data *pmd); +void flush_and_free_pb(struct para_buffer *pb); /* score */ void score_init(struct afs_table *t); @@ -245,19 +246,18 @@ 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, long score, - struct audio_file_data *afd); +int open_and_update_audio_file(struct audio_file_data *afd); int load_afd(int shmid, struct audio_file_data *afd); int get_afsi_of_row(const struct osl_row *row, struct afs_info *afsi); int get_afhi_of_row(const struct osl_row *row, struct afh_info *afhi); int get_audio_file_path_of_row(const struct osl_row *row, char **path); int audio_file_loop(void *private_data, osl_rbtree_loop_func *func); -void aft_check_callback(int fd, __a_unused const struct osl_object *query); +int aft_check_callback(int fd, __a_unused const struct osl_object *query); /* playlist */ int playlist_open(char *name); void playlist_close(void); -void playlist_check_callback(int fd, __a_unused const struct osl_object *query); +int playlist_check_callback(int fd, __a_unused const struct osl_object *query); /** 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)))