X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.h;h=7a30947a637e43fbeccc9788b30c21f917a427df;hp=f6286b24ba6243f561f264aa404601c1d4d4a29d;hb=a23e12ae76608a7ba3d333d8d76d5bbba0ba3ef0;hpb=a358653e195bb99f97aeedd7e23956b3caa10fa7;ds=sidebyside

diff --git a/afh.h b/afh.h
index f6286b24..7a30947a 100644
--- a/afh.h
+++ b/afh.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 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) */
+/** \file afh.h Structures for audio format handling (para_server). */
 
 /**
  * The tags used by all audio format handlers.
@@ -28,9 +28,9 @@ struct taginfo {
 /** Audio format dependent information. */
 struct afh_info {
 	/** The number of chunks this audio file contains. */
-	long unsigned chunks_total;
+	uint32_t chunks_total;
 	/** The length of the audio file in seconds. */
-	long unsigned seconds_total;
+	uint32_t seconds_total;
 	/** Audio handler specific info about the file. */
 	char *techinfo;
 	/** Id3 tags, vorbis comments, aac tags. */
@@ -42,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
@@ -63,13 +58,25 @@ 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.
+ * Structure for audio format handling.
  *
- *  There's one such struct for each supported audio format. Initially, only \a
- *  name and \a init are defined. During the startup process, para_server calls
- *  the \a init function of each audio format handler which is expected to fill
- *  in the other part of this struct.
+ * There's one such struct for each supported audio format. Initially, only \a
+ * name and \a init are defined. During the startup process, para_server calls
+ * the \a init function of each audio format handler which is expected to fill
+ * in the other part of this struct.
  */
 struct audio_format_handler {
 	/** Name of the audio format. */
@@ -85,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
@@ -95,6 +102,16 @@ 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);
+	/**
+	 * Write audio file with altered tags, optional.
+	 *
+	 * The output file descriptor has been opened by the caller and must not
+	 * be closed in this function.
+	 */
+	int (*rewrite_tags)(const char *map, size_t mapsize, struct taginfo *tags,
+		int output_fd, const char *filename);
 };
 
 void afh_init(void);
@@ -104,4 +121,12 @@ 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);
+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);
+int afh_rewrite_tags(int audio_format_id, void *map, size_t mapsize,
+		struct taginfo *tags, int output_fd, const char *filename);