X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_common.c;h=769674134b0f16d88bbe856d2daf972e54ed4c1b;hp=bb04453f599e29218abb955d18fcb74a078d1eb8;hb=37ae4ca0d9fb24ee2a35ac3786bcd3d8a6272535;hpb=395aeb9da9c9cc2febe91b5a906c72e59e217594

diff --git a/afh_common.c b/afh_common.c
index bb04453f..76967413 100644
--- a/afh_common.c
+++ b/afh_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -9,7 +9,6 @@
 #include <sys/mman.h> /* mmap */
 #include <sys/time.h> /* gettimeofday */
 #include <sys/types.h>
-#include <dirent.h>
 #include <regex.h>
 
 #include "para.h"
@@ -26,7 +25,11 @@ void mp3_init(struct audio_format_handler *);
 #ifdef HAVE_FAAD
 	void aac_afh_init(struct audio_format_handler *);
 #endif
+#ifdef HAVE_SPEEX
+	void spx_afh_init(struct audio_format_handler *);
+#endif
 
+void wma_afh_init(struct audio_format_handler *);
 /**
  * The list of supported audio formats.
  *
@@ -54,6 +57,16 @@ static struct audio_format_handler afl[] = {
 		.name = "aac",
 #ifdef HAVE_FAAD
 		.init = aac_afh_init,
+#endif
+	},
+	{
+		.name = "wma",
+		.init = wma_afh_init,
+	},
+	{
+		.name = "spx",
+#ifdef HAVE_SPEEX
+		.init = spx_afh_init,
 #endif
 	},
 	{
@@ -84,7 +97,7 @@ void afh_init(void)
 	int i;
 
 	PARA_INFO_LOG("supported audio formats: %s\n",
-		SUPPORTED_AUDIO_FORMATS);
+		SERVER_AUDIO_FORMATS);
 	FOR_EACH_AUDIO_FORMAT(i) {
 		PARA_NOTICE_LOG("initializing %s handler\n",
 			audio_format_name(i));
@@ -146,7 +159,6 @@ int compute_afhi(const char *path, char *data, size_t size, int fd,
 {
 	int ret, i, format;
 
-	afhi->header_offset = 0;
 	afhi->header_len = 0;
 	afhi->techinfo = NULL;
 	afhi->tags.artist = NULL;
@@ -206,9 +218,9 @@ success:
  */
 const char *audio_format_name(int i)
 {
-	//PARA_NOTICE_LOG("array size: %u¸ requested: %d\n", ARRAY_SIZE(afl), i);
-	assert(i < 0 || i < ARRAY_SIZE(afl) - 1);
-	return i >= 0?  afl[i].name : "(none)";
+	if (i < 0 || i >= ARRAY_SIZE(afl) - 1)
+		return "???";
+	return afl[i].name;
 }
 
 /**
@@ -231,34 +243,56 @@ void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
 	*len = afhi->chunk_table[chunk_num + 1] - pos;
 }
 
-uint32_t afh_get_largest_chunk_size(struct afh_info *afhi)
-{
-	uint32_t n, largest = 0, *ct = afhi->chunk_table;
-
-	for (n = 1; n <= afhi->chunks_total; n++)
-		largest = PARA_MAX(largest, ct[n] - ct[n - 1]);
-	return largest;
-}
-
 /**
  * Get the header of an audio file.
  *
  * \param afhi The audio file handler data describing the file.
+ * \param audio_format_id Determines the audio format handler.
  * \param map The data of the audio file.
+ * \param mapsize The amount of bytes of the mmapped audio file.
  * \param buf The length of the header is stored here.
  * \param len Points to a buffer containing the header on return.
  *
  * This function sets \a buf to \p NULL and \a len to zero if \a map or \a
  * afhi is \p NULL, or if the current audio format does not need special
  * header treatment.
+ *
+ * Otherwise, it is checked whether the audio format handler given by
+ * \a audio_format_id defines a ->get_header() method. If it does, this
+ * method is called to obtain the header. If ->get_header() is \p NULL,
+ * a reference to the first chunk of the audio file is returned.
+ *
+ * Once the header is no longer needed, the caller must call \ref
+ * afh_free_header() to free the resources allocated by this function.
  */
-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)
 {
+	struct audio_format_handler *afh = afl + audio_format_id;
+
 	if (!map || !afhi || !afhi->header_len) {
 		*buf = NULL;
 		*len = 0;
 		return;
 	}
-	*len = afhi->header_len;
-	*buf = map + afhi->header_offset;
+	if (!afh->get_header) {
+		*len = afhi->header_len;
+		*buf = map;
+		return;
+	}
+	afh->get_header(map, mapsize, buf, len);
+}
+
+/**
+ * Deallocate any resources obtained from afh_get_header().
+ *
+ * \param header_buf Pointer obtained via afh_get_header().
+ * \param audio_format_id Determines the audio format handler.
+ */
+void afh_free_header(char *header_buf, uint8_t audio_format_id)
+{
+	struct audio_format_handler *afh = afl + audio_format_id;
+
+	if (afh->get_header)
+		free(header_buf);
 }