X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=7145c41b9ee71d10ad1fcaeb492532176dfcc25a;hp=699998b03979abb33afa8eb9fae5db709ddffd2a;hb=d0d27cfa56d05eaa0e5567c75adfe606eab2957e;hpb=7584638594109184f329bead008f1dcdd9030767

diff --git a/afs.h b/afs.h
index 699998b0..7145c41b 100644
--- a/afs.h
+++ b/afs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2012 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 {
@@ -21,7 +20,7 @@ struct afs_info {
 	uint32_t image_id;
 	/** Lyrics blob associated with this file (foreign key). */
 	uint32_t lyrics_id;
-	/** Mp3, ogg or aac. */
+	/** Mp3, ogg, aac, wma, spx. */
 	uint8_t audio_format_id;
 	/** Amplification value. */
 	uint8_t amp;
@@ -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);
 };
@@ -203,7 +206,7 @@ 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 sc_send_result(struct osl_object *result, void *private);
 int pass_buffer_as_shm(char *buf, size_t size, void *fd_ptr);
 
 __noreturn void afs_init(uint32_t cookie, int socket_fd);