Merge branch 't/testsuite'

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 8b62e083fa8bde9b153e97e66315f2a03c4cbdcb..e66373cc87ed475682655a9dac17baec92144496 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -167,7 +167,7 @@ struct command_task {
  * \return The audio format number on success, -E_UNSUPPORTED_AUDIO_FORMAT if
  * \a name is not a supported audio format.
  */
-int get_audio_format_num(const char *name)
+static int get_audio_format_num(const char *name)
 {
        int i;
 
@@ -469,20 +469,6 @@ static int get_empty_slot(void)
        return -E_NO_MORE_SLOTS;
 }
 
-/**
- * get the number of filters
- *
- * \param audio_format_num the number identifying the audio format
- *
- * \return the number of filters for the given audio format
- *
- * \sa struct filter;
- */
-int num_filters(int audio_format_num)
-{
-       return afi[audio_format_num].num_filters;
-}
-
 static void open_filters(struct slot_info *s)
 {
        struct audio_format_info *a = afi + s->format;
@@ -823,6 +809,14 @@ static int parse_receiver_args(void)
                ret = get_audio_format_num(arg);
                if (ret < 0)
                        goto out;
+               /*
+                * If multiple receivers are given for this audio format, the
+                * last one wins and we have to free the previous receiver
+                * config here. Since we are iterating backwards, the winning
+                * receiver arg is in fact the first one given.
+                */
+               if (afi[ret].receiver_conf)
+                       afi[ret].receiver->free_config(afi[ret].receiver_conf);
                afi[ret].receiver_conf = check_receiver_arg(recv_arg, &receiver_num);
                if (!afi[ret].receiver_conf) {
                        ret = -E_RECV_SYNTAX;
@@ -830,9 +824,9 @@ static int parse_receiver_args(void)
                }
                afi[ret].receiver = &receivers[receiver_num];
        }
-       /* use the first available receiver with no arguments
-        * for those audio formats for which no receiver
-        * was specified
+       /*
+        * Use the first available receiver with no arguments for those audio
+        * formats for which no receiver was specified.
         */
        cmd = para_strdup(receivers[0].name);
        FOR_EACH_AUDIO_FORMAT(i) {
@@ -1298,17 +1292,14 @@ __noreturn static void print_help_and_die(void)
 
 static void init_colors_or_die(void)
 {
-       int ret, i;
+       int i;
 
        if (!want_colors())
                return;
        daemon_set_default_log_colors();
        daemon_set_flag(DF_COLOR_LOG);
-       for (i = 0; i < conf.log_color_given; i++) {
-               ret = daemon_set_log_color(conf.log_color_arg[i]);
-               if (ret < 0)
-                       exit(EXIT_FAILURE);
-       }
+       for (i = 0; i < conf.log_color_given; i++)
+               daemon_set_log_color_or_die(conf.log_color_arg[i]);
 }
 
 /**