server: Convert blob commands to lopsub.

[paraslash.git] / afs.h

diff --git a/afs.h b/afs.h
index 81012ff888a95e2a9b7232671b0577d0b6ffd19d..3d13aea277d7459e9fd36d194cc4ff710473022c 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -6,8 +6,6 @@
 
 /** \file afs.h Exported symbols of the audio file selector. */
 
-#include <regex.h>
-
 /** Audio file selector data stored in the audio file table. */
 struct afs_info {
        /** Seconds since the epoch. */
@@ -147,8 +145,12 @@ struct pattern_match_data {
        unsigned pm_flags;
        /** This value is passed verbatim to fnmatch(). */
        int fnmatch_flags;
+       /** Obtained by deserializing the query buffer in the callback. */
+       struct lls_parse_result *lpr;
        /** Null-terminated array of patterns. */
        struct osl_object patterns;
+       /** Do not try to match the first inputs of lpr */
+       unsigned input_skip;
        /** Data pointer passed to the action function. */
        void *data;
        /** Gets increased by one for each match. */
@@ -163,6 +165,9 @@ struct afs_callback_arg {
        int fd;
        /** Callback-specific data. */
        struct osl_object query;
+       /** Will be written on band SBD_OUTPUT, fully buffered. */
+       struct para_buffer pbout;
+       struct lls_parse_result *lpr;
 };
 
 /**
@@ -228,9 +233,11 @@ int send_option_arg_callback_request(struct osl_object *options,
 int send_standard_callback_request(int argc,  char * const * const argv,
                afs_callback *f, callback_result_handler *result_handler,
                void *private_result_data);
+int send_lls_callback_request(afs_callback *f,
+               const struct lls_command * const cmd,
+               struct lls_parse_result *lpr, 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);
@@ -264,7 +271,7 @@ int audio_file_loop(void *private_data, osl_rbtree_loop_func *func);
 int aft_check_callback(struct afs_callback_arg *aca);
 
 /* playlist */
-int playlist_open(char *name);
+int playlist_open(const char *name);
 void playlist_close(void);
 int playlist_check_callback(struct afs_callback_arg *aca);