fix conflict

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 3b6111964a8012de6bbdddd4b7ec340a1173ce48..c88facc798506c7ec567be774044780b872a500d 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -400,16 +400,18 @@ static void rn_event_handler(struct task *t)
        }
 }
 
-static void open_receiver(int format)
+static int open_receiver(int format)
 {
        struct audio_format_info *a = &afi[format];
        struct slot_info *s;
        int ret, slot_num;
        struct receiver_node *rn;
+       const struct timeval restart_delay = {1, 0};
 
-       slot_num = get_empty_slot();
-       if (slot_num < 0)
-               clean_exit(EXIT_FAILURE, PARA_STRERROR(-slot_num));
+       ret = get_empty_slot();
+       if (ret < 0)
+               goto err;
+       slot_num = ret;
        s = &slot[slot_num];
        s->format = format;
        s->receiver_node = para_calloc(sizeof(struct receiver_node));
@@ -418,11 +420,9 @@ static void open_receiver(int format)
        rn->conf = a->receiver_conf;
        ret = a->receiver->open(s->receiver_node);
        if (ret < 0) {
-               PARA_ERROR_LOG("failed to open receiver (%s)\n",
-                       PARA_STRERROR(-ret));
                free(s->receiver_node);
                s->receiver_node = NULL;
-               return;
+               goto err;
        }
        PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
                audio_formats[s->format], a->receiver->name, slot_num);
@@ -432,6 +432,11 @@ static void open_receiver(int format)
        rn->task.event_handler = rn_event_handler;
        sprintf(rn->task.status, "%s receiver node", rn->receiver->name);
        register_task(&rn->task);
+       return 1;
+err:
+       PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+       tv_add(now, &restart_delay, &afi[format].restart_barrier);
+       return ret;
 }
 
 static int receiver_running(int format)
@@ -463,8 +468,7 @@ static int open_current_receiver(struct sched *s)
                s->timeout = diff;
                return 0;
        }
-       open_receiver(i);
-       return 1;
+       return open_receiver(i) < 0? 0 : 1;
 }
 
 static void compute_time_diff(const struct timeval *status_time)
@@ -657,7 +661,6 @@ static void audiod_post_select(__a_unused struct sched *s,
 {
        int i;
 
-       /* save away the current time for other users */
        t->ret = 1;
        FOR_EACH_SLOT(i)
                try_to_close_slot(i);
@@ -952,8 +955,7 @@ static void command_post_select(struct sched *s, struct task *t)
        struct command_task *ct = t->private_data;
 
        t->ret = 1; /* always successful */
-       if (audiod_status != AUDIOD_OFF)
-               audiod_status_dump();
+       audiod_status_dump();
        if (!FD_ISSET(ct->fd, &s->rfds))
                return;
        ret = handle_connect(ct->fd);