X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=afs.h;h=72081ab6163fbc7748a1332e4e1701cde8433184;hb=ec17f2a2552856bc5efa8e9dcdb0707b8c7e2694;hp=97bc03329e4c940d16428acea2291126eb6bb9bb;hpb=0fa4e460a878fe80f937df5e1da31a33221e0ee0;p=paraslash.git

diff --git a/afs.h b/afs.h
index 97bc0332..72081ab6 100644
--- a/afs.h
+++ b/afs.h
@@ -12,7 +12,7 @@
 struct afs_info {
 	/** Seconds since the epoch. */
 	uint64_t last_played;
-	/** Bitfield of set attributes. */
+	/** Bit field of set attributes. */
 	uint64_t attributes;
 	/** Counts how many times the file was selected. */
 	uint32_t num_played;
@@ -31,33 +31,6 @@ struct table_info {
 	enum afs_table_flags flags;
 };
 
-enum ls_sorting_method {
-	/** -sp (default) */
-	LS_SORT_BY_PATH,
-	/** -ss */
-	LS_SORT_BY_SCORE,
-	/** -sl */
-	LS_SORT_BY_LAST_PLAYED,
-	/** -sn */
-	LS_SORT_BY_NUM_PLAYED,
-	/** -sf */
-	LS_SORT_BY_FREQUENCY,
-	/** -sc */
-	LS_SORT_BY_CHANNELS,
-	/** -si */
-	LS_SORT_BY_IMAGE_ID,
-	/** -sy */
-	LS_SORT_BY_LYRICS_ID,
-	/** -sb */
-	LS_SORT_BY_BITRATE,
-	/** -sd */
-	LS_SORT_BY_DURATION,
-	/** -sa */
-	LS_SORT_BY_AUDIO_FORMAT,
-	/** -sh */
-	LS_SORT_BY_HASH,
-};
-
 enum play_mode {PLAY_MODE_MOOD, PLAY_MODE_PLAYLIST};
 
 struct audio_file_data {
@@ -69,6 +42,23 @@ struct audio_file_data {
 	struct osl_object map;
 };
 
+enum pattern_match_flags {
+	PM_REVERSE_LOOP = 1,
+	PM_NO_PATTERN_MATCHES_EVERYTHING = 2,
+	PM_SKIP_EMPTY_NAME = 4,
+};
+
+struct pattern_match_data {
+	struct osl_table *table;
+	unsigned loop_col_num;
+	unsigned match_col_num;
+	unsigned pm_flags;
+	int fnmatch_flags;
+	struct osl_object patterns;
+	void *data;
+	int (*action)(struct osl_table *table, struct osl_row *row, const char *name, void *data);
+};
+
 /* afs */
 typedef int callback_function(const struct osl_object *, struct osl_object *);
 __noreturn int afs_init(uint32_t cookie, int socket_fd);
@@ -82,9 +72,9 @@ 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 para_atol(const char *str, long *result);
 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);
 
 /* score */
 int score_init(struct table_info *ti, const char *db);