X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_common.c;h=08bcde90697ec251c50ebd58abaf5f7ddf3ecff0;hp=cad972d94026eb1f1587fdf7201b752786b801b7;hb=9aa1f3d69c0aa335b3026581defbc09eb2c4efb4;hpb=72e9bdf7c5c09ca4c20cad56c68a9a155cceff43

diff --git a/afh_common.c b/afh_common.c
index cad972d9..08bcde90 100644
--- a/afh_common.c
+++ b/afh_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -15,27 +15,10 @@
 #include "string.h"
 #include "afh.h"
 
-/* The mp3 audio format handler does not need any libs. */
-void mp3_init(struct audio_format_handler *);
-
-#ifdef HAVE_OGGVORBIS
-	void ogg_init(struct audio_format_handler *);
-#endif
-#ifdef HAVE_FAAD
-	void aac_afh_init(struct audio_format_handler *);
-#endif
-#ifdef HAVE_SPEEX
-	void spx_afh_init(struct audio_format_handler *);
-#endif
-#ifdef HAVE_FLAC
-	void flac_afh_init(struct audio_format_handler *);
-#endif
-
-#ifdef HAVE_OPUS
-	void opus_afh_init(struct audio_format_handler *);
-#endif
-
-void wma_afh_init(struct audio_format_handler *);
+typedef void afh_init_func(struct audio_format_handler *);
+/* It does not hurt to declare init functions which are not available. */
+extern afh_init_func mp3_init, ogg_init, aac_afh_init, wma_afh_init,
+	spx_afh_init, flac_afh_init, opus_afh_init;
 
 /** The list of all status items */
 const char *status_item_list[] = {STATUS_ITEM_ARRAY};
@@ -59,7 +42,7 @@ static struct audio_format_handler afl[] = {
 	},
 	{
 		.name = "ogg",
-#ifdef HAVE_OGGVORBIS
+#if defined(HAVE_OGG) && defined(HAVE_VORBIS)
 		.init = ogg_init,
 #endif
 	},
@@ -75,7 +58,7 @@ static struct audio_format_handler afl[] = {
 	},
 	{
 		.name = "spx",
-#ifdef HAVE_SPEEX
+#if defined(HAVE_OGG) && defined(HAVE_SPEEX)
 		.init = spx_afh_init,
 #endif
 	},
@@ -87,7 +70,7 @@ static struct audio_format_handler afl[] = {
 	},
 	{
 		.name = "opus",
-#ifdef HAVE_OPUS
+#if defined(HAVE_OGG) && defined(HAVE_OPUS)
 		.init = opus_afh_init,
 #endif
 	},
@@ -118,9 +101,9 @@ void afh_init(void)
 {
 	int i;
 
-	PARA_INFO_LOG("supported audio formats: %s\n", AUDIO_FORMAT_HANDLERS);
+	PARA_NOTICE_LOG("supported audio formats: %s\n", AUDIO_FORMAT_HANDLERS);
 	FOR_EACH_AUDIO_FORMAT(i) {
-		PARA_NOTICE_LOG("initializing %s handler\n",
+		PARA_INFO_LOG("initializing %s handler\n",
 			audio_format_name(i));
 		afl[i].init(&afl[i]);
 	}
@@ -230,11 +213,12 @@ success:
 }
 
 /**
- * Deallocate contents of a filled-in ahi structure
+ * Deallocate the contents of an afh_info structure.
  *
  * \param afhi The structure to clear.
  *
- * The given pointer is kept, everything else is freed.
+ * This only frees the memory the various pointer fields of \a afhi point to.
+ * It does *not* free \a afhi itself.
  */
 void clear_afhi(struct afh_info *afhi)
 {
@@ -264,6 +248,12 @@ const char *audio_format_name(int i)
 	return afl[i].name;
 }
 
+static inline size_t get_chunk_len(long unsigned chunk_num,
+		const struct afh_info *afhi)
+{
+	return afhi->chunk_table[chunk_num + 1] - afhi->chunk_table[chunk_num];
+}
+
 /**
  * Get one chunk of audio data.
  *
@@ -281,7 +271,28 @@ void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
 {
 	size_t pos = afhi->chunk_table[chunk_num];
 	*buf = map + pos;
-	*len = afhi->chunk_table[chunk_num + 1] - pos;
+	*len = get_chunk_len(chunk_num, afhi);
+}
+
+/**
+ * Find a suitable start chunk.
+ *
+ * \param approx_chunk_num Upper bound for the chunk number to return.
+ * \param afhi Needed for the chunk table.
+ *
+ * \return The first non-empty chunk <= \a approx_chunk_num.
+ *
+ * \sa \ref afh_get_chunk().
+ */
+int32_t afh_get_start_chunk(int32_t approx_chunk_num,
+		const struct afh_info *afhi)
+{
+	int32_t k;
+
+	for (k = PARA_MAX(0, approx_chunk_num); k >= 0; k--)
+		if (get_chunk_len(k, afhi) > 0)
+			break;
+	return k;
 }
 
 /**