X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afh.h;h=ba72d80e5917b103e879ce221526d1a1a5e3fccc;hb=d440a71683940a58747de6dc32643db452d9cf54;hp=d2ac93aec96f95a0ca0bf706327f831520145ee7;hpb=d31995b3074bb19aa4da66ce5c4774ca9ed101a1;p=paraslash.git

diff --git a/afh.h b/afh.h
index d2ac93ae..ba72d80e 100644
--- a/afh.h
+++ b/afh.h
@@ -58,8 +58,6 @@ struct afh_info {
 
 /** Data about the current audio file, passed from afs to server. */
 struct audio_file_data {
-	/** The open file descriptor to the current audio file. */
-	int fd;
 	/** Vss needs this for streaming. */
 	struct afh_info afhi;
 	/**
@@ -80,14 +78,6 @@ struct audio_file_data {
  * in the other part of this struct.
  */
 struct audio_format_handler {
-	/** Name of the audio format. */
-	const char *name;
-	/**
-	 * Pointer to the audio format handler's init function.
-	 *
-	 * Must initialize all function pointers and is assumed to succeed.
-	 */
-	void (*init)(struct audio_format_handler*);
 	/** Typical file endings for files that can be handled by this afh. */
 	const char * const *suffixes;
 	/**
@@ -121,8 +111,8 @@ struct audio_format_handler {
 	 * portion of the memory mapped audio file. The caller must not call
 	 * free() on it.
 	 */
-	int (*get_chunk)(long unsigned chunk_num, void *afh_context,
-		const char **buf, size_t *len);
+	int (*get_chunk)(uint32_t chunk_num, void *afh_context,
+		const char **buf, uint32_t *len);
 	/** Deallocate the resources occupied by ->open(). */
 	void (*close)(void *afh_context);
 	/**
@@ -135,14 +125,13 @@ struct audio_format_handler {
 		int output_fd, const char *filename);
 };
 
-void afh_init(void);
 int guess_audio_format(const char *name);
 int compute_afhi(const char *path, char *data, size_t size,
 	int fd, struct afh_info *afhi);
 const char *audio_format_name(int);
 __must_check int afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
 		uint8_t audio_format_id, const void *map, size_t mapsize,
-		const char **buf, size_t *len, void **afh_context);
+		const char **buf, uint32_t *len, void **afh_context);
 void afh_close(void *afh_context, uint8_t audio_format_id);
 int32_t afh_get_start_chunk(int32_t approx_chunk_num,
 		const struct afh_info *afhi, uint8_t audio_format_id);