X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=3ff94f3b51e0ec5b3198cf037f25a6c8b958f198;hp=e77cdf020d2c2b7716dd03c9050cdc6c42b4c3f5;hb=c6e27c71877391685e30388689137a7d63cac58f;hpb=0f4910b50116416fefb09ca67a615679067ef359

diff --git a/afs.h b/afs.h
index e77cdf02..3ff94f3b 100644
--- 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. */
@@ -165,6 +167,7 @@ struct afs_callback_arg {
 	struct osl_object query;
 	/** Will be written on band SBD_OUTPUT, fully buffered. */
 	struct para_buffer pbout;
+	struct lls_parse_result *lpr;
 };
 
 /**
@@ -223,13 +226,9 @@ __must_check int afs_event(enum afs_events event, struct para_buffer *pb,
 int send_callback_request(afs_callback *f, struct osl_object *query,
 		callback_result_handler *result_handler,
 		void *private_result_data);
-int send_option_arg_callback_request(struct osl_object *options,
-		int argc,  char * const * const argv, afs_callback *f,
-		callback_result_handler *result_handler,
-		void *private_result_data);
-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);
 
@@ -265,7 +264,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);