X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=c2abfd5ab50a57abfb7d042c698b7eaca9efd546;hp=f744dd89b20479736a4b80cd65395c313b528d12;hb=3f165887f575829f90ca6c2aedd8d1d6063a94e7;hpb=d7bb544c34b5e2eef10e13e672d82a33864be8ab diff --git a/audiod.c b/audiod.c index f744dd89..c2abfd5a 100644 --- a/audiod.c +++ b/audiod.c @@ -472,7 +472,7 @@ static void close_receiver(int slot_num) if (s->format < 0 || !s->receiver_node) return; a = &afi[s->format]; - PARA_NOTICE_LOG("closing %s recevier in slot %d (eof = %d)\n", + PARA_NOTICE_LOG("closing %s receiver in slot %d (eof = %d)\n", audio_formats[s->format] , slot_num, s->receiver_node->eof); if (!s->receiver_node->eof) unregister_task(&s->receiver_node->task); @@ -693,7 +693,7 @@ static void open_writer(int slot_num) for (i = 0; i < a->num_writers; i++) { s->wng->writer_nodes[i].conf = a->writer_conf[i]; s->wng->writer_nodes[i].writer = a->writers[i]; - sprintf(s->wng->writer_nodes[i].task.status, "writer_ node"); + sprintf(s->wng->writer_nodes[i].task.status, "writer_node"); } ret = wng_open(s->wng); s->wstime = *now; @@ -1016,7 +1016,7 @@ static int init_writers(void) ret = writer_num; goto out; } - a->writers[nw] = &writers[ret]; + a->writers[nw] = &writers[writer_num]; a->writer_conf[nw] = wconf; PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[ret], nw, writer_names[writer_num]); @@ -1566,7 +1566,7 @@ static void status_post_select(struct sched *s, struct task *t) if (ret <= 0) { close_stat_pipe(); /* avoid busy loop if server is down */ - while (sleep(1) > 0) + while (sleep(1) > 0) /* FIXME */ ; /* try again*/ } else { st->buf[ret + st->loaded] = '\0';