X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=a8f401834b8a438d7b21d96920bc7b735f0a6c6b;hp=ddbe9d8bfb58550deb89cb771815362af7a1f78b;hb=ba3cef172b3f905315c0279d0a664df4d1db149c;hpb=67d6243694e36deb43eb8bf246871d3e266b1cb2 diff --git a/audiod.c b/audiod.c index ddbe9d8b..a8f40183 100644 --- a/audiod.c +++ b/audiod.c @@ -5,8 +5,14 @@ */ /** \file audiod.c The paraslash's audio daemon. */ + +#include +#include #include #include +#include +#include +#include #include #include "para.h" @@ -649,8 +655,6 @@ static void compute_time_diff(const struct timeval *status_time) const struct timeval max_deviation = {0, 500 * 1000}; const int time_smooth = 5; - if (!status_time) - return; sign = tv_diff(status_time, now, &diff); // PARA_NOTICE_LOG("%s: sign = %i, sa_time_diff_sign = %i\n", __func__, // sign, sa_time_diff_sign); @@ -1149,13 +1153,10 @@ static void close_unused_slots(void) */ void __noreturn clean_exit(int status, const char *msg) { - int i; - if (socket_name) unlink(socket_name); close_stat_pipe(); - FOR_EACH_SLOT(i) - close_slot(i); + close_unused_slots(); audiod_cmdline_parser_free(&conf); close_stat_clients(); PARA_EMERG_LOG("%s\n", msg);