Merge branch 'maint'

[paraslash.git] / afh_common.c

diff --git a/afh_common.c b/afh_common.c
index 74701460c9163aa008c2839ef42ca580ca19db37..1005139d8365165903ac01b8dac011017346c5c9 100644 (file)
--- a/afh_common.c
+++ b/afh_common.c
@@ -10,6 +10,7 @@
 #include <sys/time.h> /* gettimeofday */
 #include <sys/types.h>
 #include <dirent.h>
+#include <regex.h>
 
 #include "para.h"
 #include "error.h"
@@ -26,6 +27,7 @@ void mp3_init(struct audio_format_handler *);
        void aac_afh_init(struct audio_format_handler *);
 #endif
 
+void wma_afh_init(struct audio_format_handler *);
 /**
  * The list of supported audio formats.
  *
@@ -55,6 +57,10 @@ static struct audio_format_handler afl[] = {
                .init = aac_afh_init,
 #endif
        },
+       {
+               .name = "wma",
+               .init = wma_afh_init,
+       },
        {
                .name = NULL,
        }
@@ -205,9 +211,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;
 }
 
 /**