Move send_buffer() and send_va_buffer() from net.c to fd.c.

[paraslash.git] / afh.h

diff --git a/afh.h b/afh.h
index 50c46eeecf740fe387f63e415781f31cd828de11..a574edf5899f9f43c4abd0f2e6fc39085bb49854 100644 (file)
--- a/afh.h
+++ b/afh.h
@@ -1,27 +1,10 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 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 " 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
@@ -102,7 +80,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 +90,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 +101,6 @@ 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);
+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);