X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.h;h=e0087a56c750355224d0719ee064caf26c237d35;hp=e7ca2820d92c0bc517f92b224efd12507d8dd716;hb=df3c03e72911edb31e7f1e32ebe29dad063e3b70;hpb=21a0bd773519c5bd39a5293f2e66ea59add8d0a9

diff --git a/afh.h b/afh.h
index e7ca2820..e0087a56 100644
--- a/afh.h
+++ b/afh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@ struct audio_format_info {
 	/** the number of chunks this audio file contains */
 	long unsigned chunks_total;
 	/** the length of the audio file in seconds */
-	int seconds_total;
+	long unsigned seconds_total;
 	/** a string that gets filled in by the audio format handler */
 	char info_string[AUDIO_FILE_INFO_SIZE];
 	/**
@@ -61,17 +61,21 @@ struct audio_format_info {
 	/** end of file timeout - do not load new audio file until this time */
 	struct timeval eof_tv;
 	/**
-	 * optional audio file header
-	 *
-	 * This is read from a sender in case a new client connects in the
-	 * middle of the stream.  The audio format handler does not need to set
-	 * this if the audio format does not need any special header treatment.
-	 * If non-NULL, it must point to a buffer holding the current audio
-	 * file header.
-	 */
-	char *header;
-	/* the length of the header, ignored if \a header is \p NULL */
+	 * The header is needed by senders in case a new client connects in the
+	 * middle of the stream. The length of the header defaults to zero
+	 * which means that this audio format does not need any special header
+	 * treatment. The audio format handler does not need to set this to
+	 * zero in this case.
+   	 */
 	unsigned header_len;
+	/**
+	 * The position of the header within the audio file. Ignored if \a
+	 * header_len equals zero.
+	 */
+	unsigned header_offset;
+	uint8_t channels;
+	uint16_t frequency;
+	uint16_t bitrate;
 };
 
 /**
@@ -108,14 +112,7 @@ struct audio_format_handler {
 	 *
 	 * \sa struct audio_format_info
 	*/
-	int (*get_file_info)(FILE *audio_file, struct audio_format_info *afi);
-	/**
-	 * cleanup function of this audio format handler
-	 *
-	 * This close function should deallocate any resources
-	 * associated with the current audio file. In particular, it is responsible
-	 * for closing the file handle. It is assumed to succeed.
-	*/
-	void (*close_audio_file)(void);
+	int (*get_file_info)(char *map, size_t numbytes,
+		struct audio_format_info *afi);
 };