audiod: Make audio_formats[] dynamic

It should only contain those audio formats that are actually supported
by audiod.

diff --git a/audiod.c b/audiod.c
index ed5344c076636f77e23fdf6c756f62e6a369a995..0629d7c6add39b778b42567d002cdd7e31bdd45c 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -41,7 +41,7 @@
 /** define the array of error lists needed by para_audiod */
 INIT_AUDIOD_ERRLISTS;
 /** define the array containing all supported audio formats */
-DEFINE_AUDIO_FORMAT_ARRAY;
+const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY NULL};
 
 /** defines how to handle one supported audio format */
 struct audio_format_info {
@@ -753,7 +753,6 @@ static int init_receivers(void)
        for (i = conf.receiver_given - 1; i >= 0; i--) {
                char *arg = conf.receiver_arg[i];
                char *recv_arg = strchr(arg, ':');
-               PARA_INFO_LOG("arg: %s\n", arg);
                ret = -E_MISSING_COLON;
                if (!recv_arg)
                        goto out;

diff --git a/audiod.h b/audiod.h
index 8faf323118aca2c6dc7e859a9192f1f39907b2fe..856bc05126dbcb54a24a311a2f0eb19b42060d95 100644 (file)
--- a/audiod.h
+++ b/audiod.h
@@ -2,12 +2,15 @@
 int num_filters(int audio_format_num);
 int get_audio_format_num(char *name);
 
-/* audio formats supportedby para_audiod */
-enum { AUDIOD_AUDIO_FORMATS_ENUM};
+/** enum of audio formats supported by para_audiod */
+enum {AUDIOD_AUDIO_FORMATS_ENUM};
 
+/** array of audio format names supported by para_audiod */
 extern const char *audio_formats[];
-#define DEFINE_AUDIO_FORMAT_ARRAY const char *audio_formats[] = {"mp3", "ogg", "aac", NULL}
+
+/** maximal number of simultaneous instances */
 #define MAX_STREAM_SLOTS 5
+
 /**
  * the possible modes of operation
  *

diff --git a/configure.ac b/configure.ac
index 2dea89b391e7a64a9aff11e5efa81f30841c5f4f..408851ed27a66032df20a6a5cf74a9096a79adec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -497,6 +497,8 @@ AC_DEFINE_UNQUOTED(WRITER_ARRAY, $array, array of supported writers)
 enum="$(for i in $audiod_audio_formats; do printf "AUDIO_FORMAT_${i}, " | tr '[a-z]' '[A-Z]'; done)"
 AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMATS_ENUM, $enum NUM_AUDIO_FORMATS,
        enum of audio formats supported by audiod)
+names="$(for i in $audiod_audio_formats; do printf \"$i\",' ' ; done)"
+AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMAT_ARRAY, $names, array of audio formats supported by audiod)
 
 gui_cmdline_objs="gui.cmdline"
 gui_errlist_objs="exec close_on_fork signal string stat ringbuffer fd"