X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=273204e6c69f1aa926b795a49ce4dbd6721e3f9b;hp=cd98a9f86129405ba79fa02988791469bea712bb;hb=027f2c1237051d2d569d6be7f381c886f659bac3;hpb=a358653e195bb99f97aeedd7e23956b3caa10fa7

diff --git a/afs.h b/afs.h
index cd98a9f8..273204e6 100644
--- a/afs.h
+++ b/afs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file afs.h Exported symbols of the audio file selector. */
 
 #include <regex.h>
-#include "hash.h"
 
 /** Audio file selector data stored in the audio file table. */
 struct afs_info {
@@ -119,8 +118,8 @@ struct ls_data {
 	char *path;
 	/** The score value (if -a was given). */
 	long score;
-	/** The sha1 hash of audio file. */
-	HASH_TYPE *hash;
+	/** The hash value of audio file data. */
+	unsigned char *hash;
 };
 
 /** Data about the current audio file, passed from afs to server. */
@@ -131,6 +130,8 @@ struct audio_file_data {
 	struct afh_info afhi;
 	/** Size of the largest chunk. */
 	uint32_t max_chunk_size;
+	/** Needed to get the audio file header. */
+	uint8_t audio_format_id;
 };
 
 /**
@@ -180,6 +181,8 @@ struct pattern_match_data {
 	struct osl_object patterns;
 	/** Data pointer passed to the action function. */
 	void *data;
+	/** Gets increased by one for each match. */
+	unsigned num_matches;
 	/** For each matching row, this function will be called. */
 	int (*action)(struct osl_table *table, struct osl_row *row, const char *name, void *data);
 };
@@ -202,9 +205,38 @@ typedef void callback_function(int fd, const struct osl_object *);
  *
  * \sa \ref send_callback_request().
  */
-typedef int callback_result_handler(struct osl_object *result, void *private);
-int rc4_send_result(struct osl_object *result, void *private);
-int pass_buffer_as_shm(char *buf, size_t size, void *fd_ptr);
+typedef int callback_result_handler(struct osl_object *result, uint8_t band, void *private);
+int afs_cb_result_handler(struct osl_object *result, uint8_t band, void *private);
+int pass_buffer_as_shm(int fd, uint8_t band, const char *buf, size_t size);
+
+/** Structure passed to the AFS max_size handler. */
+struct afs_max_size_handler_data {
+	/** Local socket connecting the command handler and the AFS process. */
+	int fd;
+	/** The sideband designator for this data packet. */
+	uint8_t band;
+};
+
+/**
+ * Standard max_size handler for AFS commands.
+ *
+ * \param buf Contains (part of) the AFS command output.
+ * \param size The number of bytes in \a buf.
+ * \param private Pointer to a \ref afs_max_size_handler_data structure.
+ *
+ * Whenever the output of an AFS command exceeds the maximal size of a shared
+ * memory area, the max size handler of the para_buffer which holds the command
+ * output is called with \a private being a pointer to a structure of type
+ * afs_max_size_handler_data.
+ *
+ * \return The return value of the underlying call to \ref
+ *  pass_buffer_as_shm().
+ */
+_static_inline_ int afs_max_size_handler(char *buf, size_t size, void *private)
+{
+	struct afs_max_size_handler_data *amshd = private;
+	return pass_buffer_as_shm(amshd->fd, amshd->band, buf, size);
+}
 
 __noreturn void afs_init(uint32_t cookie, int socket_fd);
 void afs_event(enum afs_events event, struct para_buffer *pb,
@@ -247,13 +279,9 @@ int aft_get_row_of_path(const char *path, struct osl_row **row);
 int open_and_update_audio_file(struct osl_row *aft_row, long score,
 	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);
 int get_afhi_of_row(const struct osl_row *row, struct afh_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);
 void aft_check_callback(int fd, __a_unused const struct osl_object *query);