X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=7167da49c821e74294e3df46b553333901a969f9;hp=9294ccfe6e864aa0ff624aff8e80d4742d622eea;hb=769888ee3175ed60df3c23caf51cdad5db33d141;hpb=a08d65fa0cbc5f79632be742b818f621f3dc48d0

diff --git a/afs.h b/afs.h
index 9294ccfe..7167da49 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;
@@ -28,37 +28,9 @@ enum afs_table_flags {TBLFLAG_SKIP_CREATE};
 
 struct table_info {
 	const struct osl_table_description *desc;
-	struct osl_table *table;
 	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 {
@@ -70,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);
@@ -83,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);
@@ -110,11 +99,13 @@ int get_attribute_text(uint64_t *atts, const char *delim, char **text);
 /* aft */
 int aft_init(struct table_info *ti, const char *db);
 void aft_shutdown(enum osl_close_flags flags);
-int aft_get_row_of_path(char *path, struct osl_row **row);
+int aft_get_row_of_path(const char *path, struct osl_row **row);
 int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *afd);
 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_afhi_of_row(const struct osl_row *row, struct audio_format_info *afhi);
+int get_afsi_of_path(const char *path, 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 struct osl_row *row, struct osl_object *obj);
 int audio_file_loop(void *private_data, osl_rbtree_loop_func *func);
@@ -126,6 +117,8 @@ void close_current_mood(void);
 int mood_update_audio_file(const struct osl_row *aft_row, struct afs_info *old_afsi);
 int reload_current_mood(void);
 int mood_delete_audio_file(const struct osl_row *aft_row);
+int mood_check_callback(__a_unused const struct osl_object *query,
+	struct osl_object *result);
 
 
 /* playlist */
@@ -143,7 +136,8 @@ int playlist_check_callback(__a_unused const struct osl_object *query,
 	int table_name ## _init(struct table_info *ti, const char *db); \
 	void table_name ## _shutdown(enum osl_close_flags flags); \
 	int cmd_prefix ## _get_name_by_id(uint32_t id, char **name); \
-	int cmd_prefix ## _get_name_and_def_by_row(struct osl_row *row, \
+	int cmd_prefix ## _get_def_by_id(uint32_t id, struct osl_object *def); \
+	int cmd_prefix ## _get_name_and_def_by_row(const struct osl_row *row, \
 		char **name, struct osl_object *def); \
 	extern struct osl_table *table_name ## _table;
 
@@ -152,7 +146,18 @@ DECLARE_BLOB_SYMBOLS(images, img);
 DECLARE_BLOB_SYMBOLS(moods, mood);
 DECLARE_BLOB_SYMBOLS(playlists, pl);
 
-enum blob_table_columns {BLOBCOL_ID, BLOBCOL_NAME, BLOBCOL_DEF, NUM_BLOB_COLUMNS};
+/** The columns of an abstract blob table. */
+enum blob_table_columns {
+	/** The identifier, a positive integer that never repeats. */
+	BLOBCOL_ID,
+	/** The unique name of the blob. */
+	BLOBCOL_NAME,
+	/** The actual blob contents. */
+	BLOBCOL_DEF,
+	/** A blob table has that many columns. */
+	NUM_BLOB_COLUMNS
+};
+
 #define DEFINE_BLOB_TABLE_DESC(table_name) \
 	struct osl_table_description table_name ## _table_desc = { \
 		.name = #table_name, \