X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=dfd62e6f47d0072172ed6d0ee8872350b88792e6;hp=f83943a682f5c86496f1bd6efe1cd6b265443268;hb=c73d23911d78ed10179c12ef8f79a3fcf3bbcdaf;hpb=92bdf5b8eabd215c898c2be80dcfd4565eba2eff diff --git a/audiod.c b/audiod.c index f83943a6..dfd62e6f 100644 --- a/audiod.c +++ b/audiod.c @@ -264,7 +264,7 @@ int num_filters(int audio_format_num) static void filter_event_handler(struct task *t) { - PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret)); + PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret)); struct filter_chain *fc = t->private_data; fc->error = t->ret; unregister_task(t); @@ -314,7 +314,7 @@ static void wng_event_handler(struct task *t) { struct writer_node_group *wng = t->private_data; - PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret)); + PARA_INFO_LOG("%s\n", para_strerror(-t->ret)); wng->error = t->ret; wng_unregister(wng); } @@ -350,7 +350,7 @@ static void open_writers(int slot_num) } ret = wng_open(s->wng); if (ret < 0) { - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); return; } s->wstime = *now; @@ -362,7 +362,7 @@ static void rn_event_handler(struct task *t) struct receiver_node *rn = t->private_data; int i; - PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret)); + PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret)); unregister_task(t); rn->error = t->ret; /* set restart barrier */ @@ -411,7 +411,7 @@ static int open_receiver(int format) register_task(&rn->task); return 1; err: - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); tv_add(now, &restart_delay, &afi[format].restart_barrier); return ret; } @@ -933,7 +933,7 @@ static void command_post_select(struct sched *s, struct task *t) return; ret = handle_connect(ct->fd); if (ret < 0) - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); } static void init_command_task(struct command_task *ct) @@ -1146,7 +1146,7 @@ int main(int argc, char *argv[]) log_welcome("para_audiod", conf.loglevel_arg); i = init_stream_io(); if (i < 0) { - PARA_EMERG_LOG("init stream io error: %s\n", PARA_STRERROR(-i)); + PARA_EMERG_LOG("init stream io error: %s\n", para_strerror(-i)); exit(EXIT_FAILURE); } server_uptime(UPTIME_SET); @@ -1173,6 +1173,6 @@ int main(int argc, char *argv[]) s.default_timeout.tv_usec = 99 * 1000; ret = schedule(&s); - PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); return EXIT_FAILURE; }