X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.h;h=e315f7870240b5796098e5cf9994acdfceea6cf5;hp=1e37c9c39c26a328c6663e8108f9ff2d071ff4a2;hb=6442f07bb08eb6e557086587f997b1785ea18ef7;hpb=732db80493440d188963cea27d822447925ab5ad

diff --git a/afh.h b/afh.h
index 1e37c9c3..e315f787 100644
--- a/afh.h
+++ b/afh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -23,9 +23,6 @@
 
 /** \endcond */
 
-/** size of the  audio_file info string */
-#define AUDIO_FILE_INFO_SIZE 256
-
 /** Audio format dependent information. */
 struct afh_info {
 	/** The number of chunks this audio file contains. */
@@ -33,7 +30,7 @@ struct afh_info {
 	/** The length of the audio file in seconds. */
 	long unsigned seconds_total;
 	/** A string that gets filled in by the audio format handler. */
-	char info_string[AUDIO_FILE_INFO_SIZE];
+	char *info_string;
 	/**
   	 * The table that specifies the offset of the individual pieces in
   	 * the current audio file.
@@ -43,6 +40,11 @@ struct afh_info {
 	struct timeval chunk_tv;
 	/** End of file timeout - Do not load new audio file until this time. */
 	struct timeval eof_tv;
+	/**
+	 * The position of the header within the audio file. Ignored if \a
+	 * header_len equals zero.
+	 */
+	uint32_t header_offset;
 	/**
 	 * 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
@@ -50,15 +52,10 @@ struct afh_info {
 	 * 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;
+	uint32_t header_len;
 	/** The number of channels. */
 	uint8_t channels;
-	/** Frquency on Hz. */
+	/** Frequency in Hz. */
 	uint16_t frequency;
 	/** Exact meaning depends on audio format. */
 	uint16_t bitrate;
@@ -94,12 +91,17 @@ struct audio_format_handler {
 	 *
 	 * \sa struct afh_info
 	 */
-	int (*get_file_info)(char *map, size_t numbytes,
+	int (*get_file_info)(char *map, size_t numbytes, int fd,
 		struct afh_info *afi);
 };
 
 void afh_init(void);
 int guess_audio_format(const char *name);
 int compute_afhi(const char *path, char *data, size_t size,
-	struct afh_info *afhi);
+	int fd, struct afh_info *afhi);
 const char *audio_format_name(int);
+void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
+		void *map, const char **buf, size_t *len);
+void afh_get_header(struct afh_info *afhi, void *map, const char **buf, size_t *len);
+char *make_taginfo(char *title, char *artist, char *album, char *year,
+		char *comment);