X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fade.c;h=38a6517cd0dbadc47671f00b7c0b3ba2052ec02c;hp=d21ff4036778767a8801da9fac0d36517b3dfdae;hb=2c679eeb8bbc93220f85403eca6e9380dc624a6a;hpb=2bca38fbb97e6c5371591eb754b79cc12525aba0 diff --git a/fade.c b/fade.c index d21ff403..38a6517c 100644 --- a/fade.c +++ b/fade.c @@ -1,23 +1,14 @@ /* * Copyright (C) 1998-2007 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file fade.c a volume fader and alarm clock */ +#include +#include + #include "fade.cmdline.h" #include "para.h" #include "fd.h" @@ -288,9 +279,16 @@ int main(int argc, char *argv[]) conf.config_file_arg); exit(EXIT_FAILURE); } - if (ret) - fade_cmdline_parser_configfile(conf.config_file_arg, - &conf, 0, 0, 0); + if (ret) { + struct fade_cmdline_parser_params params = { + .override = 0, + .initialize = 0, + .check_required = 0, + .check_ambiguity = 0 + }; + fade_cmdline_parser_config_file(conf.config_file_arg, + &conf, ¶ms); + } ret = open_mixer(); if (ret < 0) { PARA_EMERG_LOG("can not open mixer device %s.",