server: Include git version in output of com_si().

[paraslash.git] / afh.h

diff --git a/afh.h b/afh.h
index 95cd0514224f0ab462daeff25011f742bbad44d3..8b747f8a436b0da18f3cd83a8e90c50e23e7ea83 100644 (file)
--- a/afh.h
+++ b/afh.h
@@ -1,28 +1,11 @@
 /*
- * Copyright (C) 2005-2010 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 " wma "
-
-/** \endcond */
-
 /**
  * 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
@@ -112,6 +90,8 @@ struct audio_format_handler {
         */
        int (*get_file_info)(char *map, size_t numbytes, int fd,
                struct afh_info *afi);
+
+       void (*get_header)(void *map, size_t mapsize, char **buf, size_t *len);
 };
 
 void afh_init(void);
@@ -122,4 +102,6 @@ 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);