Merge branch 't/ogg_timining_fixes'

[paraslash.git] / afh.h

diff --git a/afh.h b/afh.h
index 276452d8ba00c223802d4c8a79058fa2f5604d56..8f74e236501189de420d1eec75a9a40b952b1707 100644 (file)
--- a/afh.h
+++ b/afh.h
@@ -1,30 +1,29 @@
 /*
- * Copyright (C) 2005-2008 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 */
-
-/** Size of the audio_file info string. */
-#define AUDIO_FILE_INFO_SIZE 256
+/**
+ * The tags used by all audio format handlers.
+ *
+ * Paraslash only uses the more common tags. These are recognized
+ * for all supported audio formats.
+ */
+struct taginfo {
+       /** TPE1 (id3v2) / ARTIST (vorbis) / ©ART (aac) */
+       char *artist;
+       /** TIT2/TITLE/©nam */
+       char *title;
+       /** TDRC/YEAR/©day */
+       char *year;
+       /** TALB/ALBUM/©alb */
+       char *album;
+       /** COMM/COMMENT/©cmt */
+       char *comment;
+};
 
 /** Audio format dependent information. */
 struct afh_info {
@@ -32,8 +31,10 @@ struct afh_info {
        long unsigned chunks_total;
        /** The length of the audio file in seconds. */
        long unsigned seconds_total;
-       /** A string that gets filled in by the audio format handler. */
-       char info_string[AUDIO_FILE_INFO_SIZE];
+       /** Audio handler specific info about the file. */
+       char *techinfo;
+       /** Id3 tags, vorbis comments, aac tags. */
+       struct taginfo tags;
        /**
         * The table that specifies the offset of the individual pieces in
         * the current audio file.
@@ -41,8 +42,6 @@ struct afh_info {
        uint32_t *chunk_table;
        /** Period of time between sending data chunks. */
        struct timeval chunk_tv;
-       /** End of file timeout - Do not load new audio file until this time. */
-       struct timeval eof_tv;
        /**
         * The position of the header within the audio file. Ignored if \a
         * header_len equals zero.
@@ -94,14 +93,14 @@ struct audio_format_handler {
         *
         * \sa struct afh_info
         */
-       int (*get_file_info)(char *map, size_t numbytes,
+       int (*get_file_info)(char *map, size_t numbytes, int fd,
                struct afh_info *afi);
 };
 
 void afh_init(void);
 int guess_audio_format(const char *name);
 int compute_afhi(const char *path, char *data, size_t size,
-       struct afh_info *afhi);
+       int fd, struct afh_info *afhi);
 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);