X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.h;h=50c46eeecf740fe387f63e415781f31cd828de11;hp=e315f7870240b5796098e5cf9994acdfceea6cf5;hb=5587494468627e20fe622b6055689717262d09ab;hpb=753b26859be2150d3f4e7840a86412f96f60627a

diff --git a/afh.h b/afh.h
index e315f787..50c46eee 100644
--- a/afh.h
+++ b/afh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -19,18 +19,39 @@
 #define AAC_AUDIO_FORMAT ""
 #endif
 
-#define SUPPORTED_AUDIO_FORMATS "mp3" OV_AUDIO_FORMAT AAC_AUDIO_FORMAT
+#define SUPPORTED_AUDIO_FORMATS "mp3 " OV_AUDIO_FORMAT AAC_AUDIO_FORMAT " wma "
 
 /** \endcond */
 
+/**
+ * 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 {
 	/** The number of chunks this audio file contains. */
 	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 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.
@@ -38,8 +59,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.
@@ -102,6 +121,5 @@ 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);
-char *make_taginfo(char *title, char *artist, char *album, char *year,
-		char *comment);