X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=2a78332f2133c854937b4be239990cc6a3e1caf8;hp=d4abb3b2ba3a2e01d3da64dd7834aecae40dd2e1;hb=b76b4c2c3b974afa062d9fa087c18fd3483cbf8a;hpb=f6f50d03a09d6bc423324206d274336e9905bbb4 diff --git a/audiod.c b/audiod.c index d4abb3b2..2a78332f 100644 --- a/audiod.c +++ b/audiod.c @@ -5,9 +5,11 @@ */ /** \file audiod.c the paraslash's audio daemon */ +#include +#include #include "para.h" - +#include "error.h" #include "audiod.cmdline.h" #include "list.h" #include "sched.h" @@ -24,7 +26,6 @@ #include "fd.h" #include "write.h" #include "write_common.h" -#include "error.h" #include "signal.h" /** define the array of error lists needed by para_audiod */ @@ -104,18 +105,6 @@ struct command_task { struct task task; }; -/** - * task for signal handling - */ -struct signal_task { - /** the signal pipe */ - int fd; - /** the number of the most recent signal */ - int signum; - /** the associated task structure */ - struct task task; -}; - /** iterate over all supported audio formats */ #define FOR_EACH_AUDIO_FORMAT(af) for (af = 0; af < NUM_AUDIO_FORMATS; af++) @@ -582,7 +571,7 @@ static void try_to_close_slot(int slot_num) /* * Check if any receivers/filters/writers need to be started and do so if - * neccessary. Since the pre_select function didn't have a chance yet to put + * necessary. Since the pre_select function didn't have a chance yet to put * file descriptors into the fd sets given by s, make the upcoming select() * return immediately to avoid a long timeout in case we started something. */