random/mysql selector: make it find m4a files

This is achieved by adding an array of typical suffixes
for the audio format to struct audio_format_handler.

diff --git a/aac_afh.c b/aac_afh.c
index d6f37fcb59887403cbaf85454d703844032ee823..55efeefa1d7dc1b067e23da06294a7fb222e9304 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -233,6 +233,7 @@ static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
        return (char *)inbuf;
 }
 
        return (char *)inbuf;
 }
 

+static const char* aac_suffixes[] = {"m4a", NULL};

 /** the init function of the aac audio format handler */
 void aac_afh_init(void *p)
 {
 /** the init function of the aac audio format handler */
 void aac_afh_init(void *p)
 {


@@ -245,4 +246,5 @@ void aac_afh_init(void *p)
        af->chunk_tv.tv_sec = 0;
        af->chunk_tv.tv_usec = 23120;
        tv_scale(3, &af->chunk_tv, &af->eof_tv);
        af->chunk_tv.tv_sec = 0;
        af->chunk_tv.tv_usec = 23120;
        tv_scale(3, &af->chunk_tv, &af->eof_tv);

+       af->suffixes = aac_suffixes;

 }
 }

diff --git a/afs.h b/afs.h
index 19d5b685e927811f3ab74d6e771824f274c368c8..3f9c7fc6ba6daacd7412d56aaef1608106010c0f 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -130,6 +130,9 @@ struct audio_format_handler {
        char * (*read_chunk)(long unsigned chunk_num, ssize_t *len);
 };
 
        char * (*read_chunk)(long unsigned chunk_num, ssize_t *len);
 };
 

+extern struct audio_format_handler afl[];
+#define FOR_EACH_AUDIO_FORMAT(i) for (i = 0; afl[i].name; i++)
+

 void afs_init(void);
 void afs_send_chunk(void);
 struct timeval *afs_preselect(void);
 void afs_init(void);
 void afs_send_chunk(void);
 struct timeval *afs_preselect(void);

diff --git a/command.c b/command.c
index 5d785f5ce92f66618dafc877beb454bb2c0062e9..f2c54973888ab17557f2854eaa069dc52563837c 100644 (file)
--- a/command.c
+++ b/command.c
@@ -44,7 +44,6 @@ extern const char *status_item_list[NUM_STAT_ITEMS];
 extern struct misc_meta_data *mmd;
 extern struct gengetopt_args_info conf;
 extern struct audio_file_selector selectors[];
 extern struct misc_meta_data *mmd;
 extern struct gengetopt_args_info conf;
 extern struct audio_file_selector selectors[];

-extern struct audio_format_handler afl[];

 extern struct sender senders[];
 extern char *user_list;
 struct sockaddr_in *in_addr;
 extern struct sender senders[];
 extern char *user_list;
 struct sockaddr_in *in_addr;

diff --git a/db.c b/db.c
index 26f82d4a26d2ebbeb94be0f05a176df98692f4d9..cb6f692a74cd136a712f961294b3b9fbc735729c 100644 (file)
--- a/db.c
+++ b/db.c
@@ -33,19 +33,20 @@
  */
 static int match_audio_file_name(char *name)
 {
  */
 static int match_audio_file_name(char *name)
 {

-       int i, len = strlen(name);
-       const char *pattern[] = {SUPPORTED_AUDIO_FORMATS_ARRAY};
+       int i,j, len = strlen(name);

 
 

-       for (i = 0; pattern[i]; i++) {
-               const char *p = pattern[i];
-               int plen = strlen(p);
-               if (len < plen + 1)
-                       continue;
-               if (name[len - plen - 1] != '.')
-                       continue;
-               if (strcasecmp(name + len - plen, p))
-                       continue;
-               return 1;
+       FOR_EACH_AUDIO_FORMAT(i) {
+               for (j = 0; afl[i].suffixes[j]; j++) {
+                       const char *p = afl[i].suffixes[j];
+                       int plen = strlen(p);
+                       if (len < plen + 1)
+                               continue;
+                       if (name[len - plen - 1] != '.')
+                               continue;
+                       if (strcasecmp(name + len - plen, p))
+                               continue;
+                       return 1;
+               }

        }
        return 0;
 }
        }
        return 0;
 }

diff --git a/mp3.c b/mp3.c
index b9b21a94de7db52f680bb90e788778fa8e74d1e6..bac84b6f9ca0e8b0677f7fec691bb42084dff760 100644 (file)
--- a/mp3.c
+++ b/mp3.c
@@ -481,6 +481,7 @@ static void mp3_close_audio_file(void)
        mp3.file = NULL;
 }
 
        mp3.file = NULL;
 }
 

+static const char* mp3_suffixes[] = {"mp3", NULL};

 void mp3_init(void *p)
 {
        af = p;
 void mp3_init(void *p)
 {
        af = p;


@@ -492,4 +493,5 @@ void mp3_init(void *p)
        /* eof_tv gets overwritten in mp3_get_file_info() */
        af->eof_tv.tv_sec = 0;
        af->eof_tv.tv_usec = 100 * 1000;
        /* eof_tv gets overwritten in mp3_get_file_info() */
        af->eof_tv.tv_sec = 0;
        af->eof_tv.tv_usec = 100 * 1000;

+       af->suffixes = mp3_suffixes;

 }
 }

diff --git a/ogg.c b/ogg.c
index e5647b26eca11e8ce975d69034944174fb973164..fa935d5090abb2a9eddb06fd87676b688fe63fc9 100644 (file)
--- a/ogg.c
+++ b/ogg.c
@@ -345,6 +345,7 @@ static char *ogg_get_header_info(int *len)
        return header;
 }
 
        return header;
 }
 

+static const char* ogg_suffixes[] = {"ogg", NULL};

 void ogg_init(void *p)
 {
        af = p;
 void ogg_init(void *p)
 {
        af = p;


@@ -356,4 +357,5 @@ void ogg_init(void *p)
        af->chunk_tv.tv_sec = 0;
        af->chunk_tv.tv_usec = 250 * 1000;
        tv_scale(3, &af->chunk_tv, &af->eof_tv);
        af->chunk_tv.tv_sec = 0;
        af->chunk_tv.tv_usec = 250 * 1000;
        tv_scale(3, &af->chunk_tv, &af->eof_tv);

+       af->suffixes = ogg_suffixes;

 }
 }

diff --git a/server.c b/server.c
index 62427717eab054950f8e26a02f3ecd3ff60d9e24..56162735a9030df40863cfb89a81894206ed49da 100644 (file)
--- a/server.c
+++ b/server.c
@@ -61,7 +61,6 @@ char *user_list = NULL;
 extern void dccp_send_init(struct sender *);
 extern void http_send_init(struct sender *);
 extern void ortp_send_init(struct sender *);
 extern void dccp_send_init(struct sender *);
 extern void http_send_init(struct sender *);
 extern void ortp_send_init(struct sender *);

-extern struct audio_format_handler afl[];

 
 /* TODO: This is better handled by autoconf */
 /** the list of supported audio file selectors */
 
 /* TODO: This is better handled by autoconf */
 /** the list of supported audio file selectors */