X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.h;h=8b747f8a436b0da18f3cd83a8e90c50e23e7ea83;hp=fbc0ba6f2bc5089b0e6f254dee042794aeec7f4c;hb=38c80b2b03dc357fbc28f8ba04764f1e1741078a;hpb=8231c4db98e5278fde9678a5d16a68fbef777662

diff --git a/afh.h b/afh.h
index fbc0ba6f..8b747f8a 100644
--- a/afh.h
+++ b/afh.h
@@ -1,27 +1,29 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file afh.h structures for audio format handling (para_server) */
 
-/** \cond */
-#ifdef HAVE_OGGVORBIS
-#define OV_AUDIO_FORMAT " ogg"
-#else
-#define OV_AUDIO_FORMAT ""
-#endif
-
-#ifdef HAVE_FAAD
-#define AAC_AUDIO_FORMAT " aac"
-#else
-#define AAC_AUDIO_FORMAT ""
-#endif
-
-#define SUPPORTED_AUDIO_FORMATS "mp3" OV_AUDIO_FORMAT AAC_AUDIO_FORMAT
-
-/** \endcond */
+/**
+ * The tags used by all audio format handlers.
+ *
+ * Paraslash only uses the more common tags. These are recognized
+ * for all supported audio formats.
+ */
+struct taginfo {
+	/** TPE1 (id3v2) / ARTIST (vorbis) / ART (aac)/ author(spx) */
+	char *artist;
+	/** TIT2/TITLE/nam */
+	char *title;
+	/** TDRC/YEAR/day */
+	char *year;
+	/** TALB/ALBUM/alb */
+	char *album;
+	/** COMM/COMMENT/cmt */
+	char *comment;
+};
 
 /** Audio format dependent information. */
 struct afh_info {
@@ -29,8 +31,10 @@ struct afh_info {
 	long unsigned chunks_total;
 	/** 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 handler specific info about the file. */
+	char *techinfo;
+	/** Id3 tags, vorbis comments, aac tags. */
+	struct taginfo tags;
 	/**
   	 * The table that specifies the offset of the individual pieces in
   	 * the current audio file.
@@ -38,13 +42,6 @@ struct afh_info {
 	uint32_t *chunk_table;
 	/** Period of time between sending data chunks. */
 	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
@@ -93,6 +90,8 @@ struct audio_format_handler {
 	 */
 	int (*get_file_info)(char *map, size_t numbytes, int fd,
 		struct afh_info *afi);
+
+	void (*get_header)(void *map, size_t mapsize, char **buf, size_t *len);
 };
 
 void afh_init(void);
@@ -102,4 +101,7 @@ int compute_afhi(const char *path, char *data, size_t size,
 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);
+uint32_t afh_get_largest_chunk_size(struct afh_info *afhi);
+void afh_get_header(struct afh_info *afhi, uint8_t audio_format_id,
+		void *map, size_t mapsize, char **buf, size_t *len);
+void afh_free_header(char *header_buf, uint8_t audio_format_id);