X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.h;h=dad67351a9ec6548dd464d691d9013afee0a0d6c;hp=7952809436752f19a795362469291a4996f0d468;hb=7afafb8acd2c8ad14802fd2dcfed5567c97454cb;hpb=39ec52d7bfec591dcad0d41bcdbdf6d980bf5913

diff --git a/afh.h b/afh.h
index 79528094..dad67351 100644
--- a/afh.h
+++ b/afh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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. */
@@ -58,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. */
@@ -76,7 +88,7 @@ struct audio_format_handler {
 	 */
 	void (*init)(struct audio_format_handler*);
 	/** Typical file endings for files that can be handled by this afh. */
-	const char **suffixes;
+	const char * const *suffixes;
 	/**
 	 * Check if this audio format handler can handle the file.
 	 *
@@ -92,6 +104,14 @@ struct audio_format_handler {
 		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);
@@ -101,7 +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);
+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);