X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.h;h=8f74e236501189de420d1eec75a9a40b952b1707;hp=7c6912c3b89fa8d71fe15f6dae7fb1eb1b6bd82c;hb=481150224edabeee0a6bbfdab232df58e5c1224e;hpb=94cc219f19a98a5a046cf9f7fb3bfe4d7ef79eb1

diff --git a/afh.h b/afh.h
index 7c6912c3..8f74e236 100644
--- a/afh.h
+++ b/afh.h
@@ -1,42 +1,40 @@
 /*
- * Copyright (C) 2005-2007 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 */
-
-/** size of the  audio_file info string */
-#define AUDIO_FILE_INFO_SIZE 256
-
 /**
- * Audio format dependent information. Details vary between each audio format
- * handler.
+ * The tags used by all audio format handlers.
+ *
+ * Paraslash only uses the more common tags. These are recognized
+ * for all supported audio formats.
  */
-struct audio_format_info {
+struct taginfo {
+	/** TPE1 (id3v2) / ARTIST (vorbis) / ©ART (aac) */
+	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 {
 	/** The number of chunks this audio file contains. */
 	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_FILE_INFO_SIZE];
+	/** 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.
@@ -44,8 +42,11 @@ struct audio_format_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
@@ -53,15 +54,10 @@ struct audio_format_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;
@@ -93,11 +89,19 @@ struct audio_format_handler {
 	 * valid for this audio format. A negative return value indicates that
 	 * this audio format handler is unable to decode the given file. On
 	 * success, the function must return a positive value and fill in the
-	 * given struct audio_format_info.
+	 * given struct afh_info.
 	 *
-	 * \sa struct audio_format_info
+	 * \sa struct afh_info
 	 */
-	int (*get_file_info)(char *map, size_t numbytes,
-		struct audio_format_info *afi);
+	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,
+	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);