X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.h;h=4204108a33131e3b4bda8a007bd429665246860c;hp=95cd0514224f0ab462daeff25011f742bbad44d3;hb=8b71176b792089c47acc788e1c1e068e9375fd18;hpb=e90440367f744a7723b201a95888e66f070ffa92

diff --git a/afh.h b/afh.h
index 95cd0514..4204108a 100644
--- a/afh.h
+++ b/afh.h
@@ -1,27 +1,10 @@
 /*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@tuebingen.mpg.de>
  *
  * 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 " wma "
-
-/** \endcond */
+/** \file afh.h Structures for audio format handling (para_server). */
 
 /**
  * The tags used by all audio format handlers.
@@ -30,15 +13,15 @@
  * for all supported audio formats.
  */
 struct taginfo {
-	/** TPE1 (id3v2) / ARTIST (vorbis) / ©ART (aac) */
+	/** TPE1 (id3v2) / ARTIST (vorbis) / ART (aac)/ author(spx) */
 	char *artist;
-	/** TIT2/TITLE/©nam */
+	/** TIT2/TITLE/nam */
 	char *title;
-	/** TDRC/YEAR/©day */
+	/** TDRC/YEAR/day */
 	char *year;
-	/** TALB/ALBUM/©alb */
+	/** TALB/ALBUM/alb */
 	char *album;
-	/** COMM/COMMENT/©cmt */
+	/** COMM/COMMENT/cmt */
 	char *comment;
 };
 
@@ -59,11 +42,6 @@ struct afh_info {
 	uint32_t *chunk_table;
 	/** Period of time between sending data chunks. */
 	struct timeval chunk_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
@@ -80,6 +58,18 @@ struct afh_info {
 	uint16_t bitrate;
 };
 
+/** 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;
+	/** Size of the largest chunk. */
+	uint32_t max_chunk_size;
+	/** Needed to get the audio file header. */
+	uint8_t audio_format_id;
+};
+
 /**
  *  Structure for audio format handling.
  *
@@ -102,7 +92,7 @@ struct audio_format_handler {
 	/**
 	 * Check if this audio format handler can handle the file.
 	 *
-	 * This is a  pointer to a function returning whether a given file is
+	 * This is a pointer to a function returning whether a given file is
 	 * 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
@@ -112,6 +102,8 @@ struct audio_format_handler {
 	 */
 	int (*get_file_info)(char *map, size_t numbytes, int fd,
 		struct afh_info *afi);
+	/** Optional, used for header-rewriting. See \ref afh_get_header(). */
+	void (*get_header)(void *map, size_t mapsize, char **buf, size_t *len);
 };
 
 void afh_init(void);
@@ -121,5 +113,10 @@ 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);
-uint32_t afh_get_largest_chunk_size(struct afh_info *afhi);
-void afh_get_header(struct afh_info *afhi, void *map, const char **buf, size_t *len);
+int32_t afh_get_start_chunk(int32_t approx_chunk_num,
+		const 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);
+void clear_afhi(struct afh_info *afhi);
+unsigned afh_get_afhi_txt(int audio_format_num, struct afh_info *afhi, char **result);