Merge remote branch 'refs/remotes/fml/master'

[paraslash.git] / afh_common.c

diff --git a/afh_common.c b/afh_common.c
index f28acaafda9f74138b5871d3d1d2590608135054..4464987a61fc5172e2601cded9aac0998c9cfda2 100644 (file)
--- a/afh_common.c
+++ b/afh_common.c
@@ -26,6 +26,9 @@ 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 *);
 /**
@@ -61,6 +64,12 @@ static struct audio_format_handler afl[] = {
                .name = "wma",
                .init = wma_afh_init,
        },
+       {
+               .name = "spx",
+#ifdef HAVE_SPEEX
+               .init = spx_afh_init,
+#endif
+       },
        {
                .name = NULL,
        }
@@ -89,7 +98,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));