X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=61630726abf91e4260c42f8963fcc394a157cf42;hp=1399b2aba2d1509fe45ab10c285ae632156dd2e4;hb=61250cf03241bf73662dac3753e44660a572fa2a;hpb=53d503ce75eb1d9439cfb75053d3cff4cbca6ff9

diff --git a/afs.h b/afs.h
index 1399b2ab..61630726 100644
--- a/afs.h
+++ b/afs.h
@@ -27,29 +27,44 @@ struct afs_info {
 };
 
 enum afs_events {
+	ATTRIBUTE_ADD,
+	ATTRIBUTE_RENAME,
+	ATTRIBUTE_REMOVE,
 	AFSI_CHANGE,
 	AFHI_CHANGE,
 	AUDIO_FILE_RENAME,
 	AUDIO_FILE_ADD,
 	AUDIO_FILE_REMOVE,
-	AUDIO_FILE_STREAMED,
-	ATTRIBUTE_ADD,
-	ATTRIBUTE_RENAME,
-	ATTRIBUTE_DELETE,
-	LYRICS_DELETE,
-	IMAGE_DELETE,
-	LYRICS_RENAME,
-	IMAGE_RENAME,
+	BLOB_ADD,
+	BLOB_RENAME,
+	BLOB_REMOVE,
 
 };
 
+struct rmatt_event_data {
+	const char *name;
+	unsigned char bitnum;
+};
+
+
+struct addatt_event_data {
+	const char *name;
+	unsigned char bitnum;
+};
+
+struct afsi_change_event_data {
+	const struct osl_row *aft_row;
+	struct afs_info *old_afsi;
+};
+
 struct afs_table {
 	void (*init)(struct afs_table *t);
 	const char *name;
 	int (*open)(const char *base_dir);
 	void (*close)(void);
 	int (*create)(const char *);
-	int (*event_handler)(enum afs_events event, struct para_buffer *pb,  void *data);
+	int (*event_handler)(enum afs_events event, struct para_buffer *pb,
+		void *data);
 	/* int *(check)() */
 };
 
@@ -57,11 +72,16 @@ enum play_mode {PLAY_MODE_MOOD, PLAY_MODE_PLAYLIST};
 
 struct audio_file_data {
 	enum play_mode current_play_mode;
+	int fd;
 	long score;
 	struct afs_info afsi;
 	struct audio_format_info afhi;
 	char *path;
-	struct osl_object map;
+};
+
+enum afs_server_code {
+	NEXT_AUDIO_FILE,
+	AFD_CHANGE
 };
 
 /** Flags passed to for_each_matching_row(). */
@@ -97,6 +117,8 @@ struct pattern_match_data {
 /* afs */
 typedef int callback_function(const struct osl_object *, struct osl_object *);
 __noreturn void afs_init(uint32_t cookie, int socket_fd);
+void afs_event(enum afs_events event, struct para_buffer *pb,
+	void *data);
 int send_callback_request(callback_function *f, struct osl_object *query,
 	struct osl_object *result);
 int send_standard_callback_request(int argc, char * const * const argv,
@@ -107,7 +129,6 @@ 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 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);
 
@@ -121,7 +142,8 @@ 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 row_belongs_to_score_table(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);
 
 /* attribute */
 void attribute_init(struct afs_table *t);
@@ -133,6 +155,7 @@ int get_attribute_text(uint64_t *atts, const char *delim, char **text);
 void aft_init(struct afs_table *t);
 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_afd(int shmid, 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);
@@ -145,9 +168,7 @@ int aft_check_callback(const struct osl_object *query, struct osl_object *result
 
 /* mood */
 int change_current_mood(char *mood_name);
-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);
 
@@ -166,8 +187,11 @@ int playlist_check_callback(__a_unused const struct osl_object *query,
 	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_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;
 
 DECLARE_BLOB_SYMBOLS(lyrics, lyr);