X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.h;h=a6394fa6b512364e6c4658361687d85a5eb32520;hb=9055c71be97f1095dcdbd83da305b600f204f763;hp=8beca5aefcd0b9d06aed05e915877a2c5104a1a8;hpb=e8d5da94efd6cbb0aa75f57290c76d9992ff8f47;p=paraslash.git

diff --git a/afs.h b/afs.h
index 8beca5ae..a6394fa6 100644
--- a/afs.h
+++ b/afs.h
@@ -73,19 +73,15 @@ struct afsi_change_event_data {
 	struct afs_info *old_afsi;
 };
 
-/** Function pointers for table handling.  */
-struct afs_table {
-	/** Initializes the other pointers in this struct. */
-	void (*init)(struct afs_table *t);
-	/** The name of this table. */
-	const char *name;
-	/** Gets called on startup and on \p SIGHUP. */
+/** Methods for table startup/shutdown and event handling. */
+struct afs_table_operations {
+	/** Gets called on startup and on SIGHUP. */
 	int (*open)(const char *base_dir);
-	/** Gets called on shutdown and on \p SIGHUP. */
+	/** Gets called on shutdown and on SIGHUP. */
 	void (*close)(void);
-	/** Called by the \a init afs command. */
+	/** Called from the init command. */
 	int (*create)(const char *);
-	/** Handles afs events. */
+	/** Handle events generated by other tables. See enum \ref afs_events. */
 	int (*event_handler)(enum afs_events event, struct para_buffer *pb,
 		void *data);
 };
@@ -233,39 +229,44 @@ int string_compare(const struct osl_object *obj1, const struct osl_object *obj2)
 int for_each_matching_row(struct pattern_match_data *pmd);
 
 /* score */
-void score_init(struct afs_table *t);
-int admissible_file_loop(void *data, osl_rbtree_loop_func *func);
+extern const struct afs_table_operations score_ops;
+int score_loop(osl_rbtree_loop_func *func, void *data);
 int score_get_best(struct osl_row **aft_row, long *score);
 int get_score_and_aft_row(struct osl_row *score_row, long *score, struct osl_row **aft_row);
 int score_add(const struct osl_row *row, long score);
 int score_update(const struct osl_row *aft_row, long new_score);
-int get_num_admissible_files(unsigned *num);
 int score_delete(const struct osl_row *aft_row);
-int clear_score_table(void);
-int row_belongs_to_score_table(const struct osl_row *aft_row, unsigned *rank);
+void score_clear(void);
+bool row_belongs_to_score_table(const struct osl_row *aft_row);
 
 /* attribute */
-void attribute_init(struct afs_table *t);
+extern const struct afs_table_operations attr_ops;
 void get_attribute_bitmap(const uint64_t *atts, char *buf); /* needed by com_ls() */
 int get_attribute_bitnum_by_name(const char *att_name, unsigned char *bitnum);
 int get_attribute_text(uint64_t *atts, const char *delim, char **text);
 int attribute_check_callback(struct afs_callback_arg *aca);
 
 /* aft */
-void aft_init(struct afs_table *t);
+extern const struct afs_table_operations aft_ops;
 int aft_get_row_of_path(const char *path, struct osl_row **row);
 int aft_check_attributes(uint64_t att_mask, struct para_buffer *pb);
-int open_and_update_audio_file(struct audio_file_data *afd);
+int open_and_update_audio_file(int *fd);
 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);
 int aft_check_callback(struct afs_callback_arg *aca);
+void free_status_items(void);
+
+/* mood */
+int mood_load(const char *mood_name, char **msg);
+void mood_unload(void);
+int mood_check_callback(struct afs_callback_arg *aca);
 
 /* playlist */
-int playlist_open(const char *name);
-void playlist_close(void);
+int playlist_load(const char *name, char **msg);
+void playlist_unload(void);
 int playlist_check_callback(struct afs_callback_arg *aca);
 
 /** evaluates to 1 if x < y, to -1 if x > y and to 0 if x == y */
@@ -274,20 +275,22 @@ int playlist_check_callback(struct afs_callback_arg *aca);
 
 /** Define exported functions and a table pointer for an osl blob table. */
 #define DECLARE_BLOB_SYMBOLS(table_name, cmd_prefix) \
-	void table_name ## _init(struct afs_table *t); \
 	int cmd_prefix ## _get_name_by_id(uint32_t id, char **name); \
 	int cmd_prefix ## _get_def_by_id(uint32_t id, struct osl_object *def); \
-	int cmd_prefix ## _get_def_by_name(char *name, struct osl_object *def); \
+	int cmd_prefix ## _get_def_by_name(const char *name, struct osl_object *def); \
 	int cmd_prefix ## _get_name_and_def_by_row(const struct osl_row *row, \
 		char **name, struct osl_object *def); \
 	int table_name ##_event_handler(enum afs_events event, \
 		struct para_buffer *pb, void *data); \
-	extern struct osl_table *table_name ## _table;
+	extern struct osl_table *table_name ## _table; \
+	extern const struct afs_table_operations table_name ## _ops;
 
+/** \cond blob_symbols */
 DECLARE_BLOB_SYMBOLS(lyrics, lyr);
 DECLARE_BLOB_SYMBOLS(images, img);
 DECLARE_BLOB_SYMBOLS(moods, mood);
 DECLARE_BLOB_SYMBOLS(playlists, pl);
+/** \endcond blob_symbols */
 
 /** The columns of an abstract blob table. */
 enum blob_table_columns {