X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=aefac612b480af2d6f1c857b5225f3d042b68ff4;hb=4744d937c4160898d1fe151257606430750e580c;hp=4858366e697973f52d9e20495e16072422632249;hpb=03655936efc48594ec7f35d82c41782e16d07f21;p=paraslash.git diff --git a/audiod.c b/audiod.c index 4858366e..aefac612 100644 --- a/audiod.c +++ b/audiod.c @@ -1,10 +1,10 @@ /* - * Copyright (C) 2005-2011 Andre Noll + * Copyright (C) 2005-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file audiod.c the paraslash's audio daemon */ +/** \file audiod.c The paraslash's audio daemon. */ #include #include #include @@ -77,6 +77,12 @@ enum vss_status_flags { VSS_STATUS_FLAG_PLAYING = 2, }; +/** + * The scheduler instance of para_audiod. + * + * This is needed also in audiod_command.c (for the tasks command), so it can + * not be made static. + */ struct sched sched = {.max_fileno = 0}; /** @@ -918,8 +924,6 @@ static int parse_filter_args(void) { int i, j, ret, af_mask; - if (!conf.no_default_filters_given) - return init_default_filters(); for (i = 0; i < conf.filter_given; i++) { char *arg; ret = parse_stream_command(conf.filter_arg[i], &arg);