Remove autogenerated doxygen comments for commands.

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 64ea8a51efeeb13cb65f86d1ea417120679ff2f4..40a35c6a601cf5839b044e44be35992b6e8036d3 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -9,7 +9,6 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <signal.h>

-#include <openssl/rc4.h>

 #include <stdbool.h>
 
 #include "para.h"
 #include <stdbool.h>
 
 #include "para.h"


@@ -167,7 +166,7 @@ struct command_task {
  * \return The audio format number on success, -E_UNSUPPORTED_AUDIO_FORMAT if
  * \a name is not a supported audio format.
  */
  * \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;
 
 {
        int i;
 


@@ -469,20 +468,6 @@ static int get_empty_slot(void)
        return -E_NO_MORE_SLOTS;
 }
 
        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;
 static void open_filters(struct slot_info *s)
 {
        struct audio_format_info *a = afi + s->format;


@@ -823,6 +808,14 @@ static int parse_receiver_args(void)
                ret = get_audio_format_num(arg);
                if (ret < 0)
                        goto out;
                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;
                afi[ret].receiver_conf = check_receiver_arg(recv_arg, &receiver_num);
                if (!afi[ret].receiver_conf) {
                        ret = -E_RECV_SYNTAX;


@@ -830,9 +823,9 @@ static int parse_receiver_args(void)
                }
                afi[ret].receiver = &receivers[receiver_num];
        }
                }
                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) {
         */
        cmd = para_strdup(receivers[0].name);
        FOR_EACH_AUDIO_FORMAT(i) {


@@ -1089,17 +1082,17 @@ static void try_to_close_slot(int slot_num)
 
        if (s->format < 0)
                return;
 
        if (s->format < 0)
                return;

-       if (s->receiver_node && s->receiver_node->task.error != -E_TASK_UNREGISTERED)
+       if (s->receiver_node && s->receiver_node->task.error >= 0)

                return;
        for (i = 0; i < a->num_filters; i++)
                return;
        for (i = 0; i < a->num_filters; i++)

-               if (s->fns && s->fns[i].task.error != -E_TASK_UNREGISTERED)
+               if (s->fns && s->fns[i].task.error >= 0)

                        return;
        if (a->num_writers > 0) {
                for (i = 0; i < a->num_writers; i++)
                        return;
        if (a->num_writers > 0) {
                for (i = 0; i < a->num_writers; i++)

-                       if (s->wns && s->wns[i].task.error != -E_TASK_UNREGISTERED)
+                       if (s->wns && s->wns[i].task.error >= 0)

                                return;
        } else {
                                return;
        } else {

-               if (s->wns && s->wns[0].task.error != -E_TASK_UNREGISTERED)
+               if (s->wns && s->wns[0].task.error >= 0)

                        return;
        }
        PARA_INFO_LOG("closing slot %d\n", slot_num);
                        return;
        }
        PARA_INFO_LOG("closing slot %d\n", slot_num);


@@ -1180,7 +1173,7 @@ static void status_post_select(__a_unused struct sched *s, struct task *t)
                        kill_btrn(st->ct->btrn, &st->ct->task, -E_AUDIOD_OFF);
                        goto out;
                }
                        kill_btrn(st->ct->btrn, &st->ct->task, -E_AUDIOD_OFF);
                        goto out;
                }

-               if (st->ct->task.error != -E_TASK_UNREGISTERED)
+               if (st->ct->task.error >= 0)

                        goto out;
                close_stat_pipe();
                st->clock_diff_count = conf.clock_diff_count_arg;
                        goto out;
                close_stat_pipe();
                st->clock_diff_count = conf.clock_diff_count_arg;


@@ -1191,7 +1184,7 @@ static void status_post_select(__a_unused struct sched *s, struct task *t)
                size_t sz;
                int ret;
                if (st->ct->task.error < 0) {
                size_t sz;
                int ret;
                if (st->ct->task.error < 0) {

-                       if (st->ct->task.error != -E_TASK_UNREGISTERED)
+                       if (st->ct->task.error >= 0)

                                goto out;
                        close_stat_pipe();
                        goto out;
                                goto out;
                        close_stat_pipe();
                        goto out;