X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_common.c;h=08bcde90697ec251c50ebd58abaf5f7ddf3ecff0;hp=914d1a321af35bae395cc365b14537e86991b42d;hb=9bfd946422ec369c4fd91aa1c674cfb277e8cd9f;hpb=9b406cbe5d20ba969713ca3d7a8033e697476d75

diff --git a/afh_common.c b/afh_common.c
index 914d1a32..08bcde90 100644
--- a/afh_common.c
+++ b/afh_common.c
@@ -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]);
 	}