X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.h;h=504bc2b213b70b4d053fba486e84cacf59c0b074;hp=8c0c15cfb007e25a6639220b848fc8934ca1ec79;hb=13f8214c662144b2afa5c9fbf3cf2fbe1e9a36f0;hpb=5836ee8e47df8966d6030ff3548ead168215edcd

diff --git a/afh.h b/afh.h
index 8c0c15cf..504bc2b2 100644
--- a/afh.h
+++ b/afh.h
@@ -9,34 +9,25 @@
 /** \cond */
 #ifdef HAVE_OGGVORBIS
 #define OV_AUDIO_FORMAT " ogg"
-#define OV_AUDIO_FORMAT_ARRAY , "ogg"
 #else
 #define OV_AUDIO_FORMAT ""
-#define OV_AUDIO_FORMAT_ARRAY
 #endif
 
 #ifdef HAVE_FAAD
 #define AAC_AUDIO_FORMAT " aac"
-#define AAC_AUDIO_FORMAT_ARRAY , "aac"
 #else
 #define AAC_AUDIO_FORMAT ""
-#define AAC_AUDIO_FORMAT_ARRAY
 #endif
 
 #define SUPPORTED_AUDIO_FORMATS "mp3" OV_AUDIO_FORMAT AAC_AUDIO_FORMAT
-#define SUPPORTED_AUDIO_FORMATS_ARRAY "mp3" OV_AUDIO_FORMAT_ARRAY \
-	AAC_AUDIO_FORMAT_ARRAY, NULL
 
 /** \endcond */
 
-/** size of the  audio_file info string */
-#define AUDIO_FILE_INFO_SIZE 16384
+/** Size of the audio_file info string. */
+#define AUDIO_FILE_INFO_SIZE 256
 
-/**
- * Audio format dependent information. Details vary between each audio format
- * handler.
- */
-struct audio_format_info {
+/** 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. */
@@ -47,7 +38,7 @@ struct audio_format_info {
   	 * The table that specifies the offset of the individual pieces in
   	 * the current audio file.
  	 */
-	size_t *chunk_table;
+	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. */
@@ -67,7 +58,7 @@ struct audio_format_info {
 	unsigned header_offset;
 	/** The number of channels. */
 	uint8_t channels;
-	/** Frquency on Hz. */
+	/** Frequency in Hz. */
 	uint16_t frequency;
 	/** Exact meaning depends on audio format. */
 	uint16_t bitrate;
@@ -99,11 +90,16 @@ struct audio_format_handler {
 	 * 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
-	 * given struct audio_format_info.
+	 * given struct afh_info.
 	 *
-	 * \sa struct audio_format_info
+	 * \sa struct afh_info
 	 */
 	int (*get_file_info)(char *map, size_t numbytes,
-		struct audio_format_info *afi);
+		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);
+const char *audio_format_name(int);