Kill afhi->header_offset.

[paraslash.git] / afh.h

diff --git a/afh.h b/afh.h
index 72987b31ad789632a3e511b10522ce65ab23d481..494a4e15adaf41bb10619b62c36a6a8a33a78fb4 100644 (file)
--- a/afh.h
+++ b/afh.h
@@ -1,28 +1,11 @@
 /*
- * Copyright (C) 2005-2009 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
-
-/** \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
@@ -121,5 +99,4 @@ 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);