X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fade.c;h=e6f550a1c94d37806b28b25b8ac17bf5b7bd10ed;hp=8ee192cd177bd65e4f886cd39c29ab9498cb69a2;hb=b01605d7062e4d1f005d5aaaaed158d8efe06d79;hpb=00583bed658c70aacf2a94532904fd403c5ee7f1 diff --git a/fade.c b/fade.c index 8ee192cd..e6f550a1 100644 --- a/fade.c +++ b/fade.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998-2012 Andre Noll + * Copyright (C) 1998-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -292,9 +292,9 @@ int main(int argc, char *argv[]) struct mixer *m; struct mixer_handle *h = NULL; - if (fade_cmdline_parser(argc, argv, &conf)) - exit(EXIT_FAILURE); + fade_cmdline_parser(argc, argv, &conf); HANDLE_VERSION_FLAG("fade", conf); + loglevel = get_loglevel_by_name(conf.loglevel_arg); ret = configfile_exists(); if (!ret && conf.config_file_given) { PARA_EMERG_LOG("can not read config file %s\n", @@ -311,8 +311,8 @@ int main(int argc, char *argv[]) }; fade_cmdline_parser_config_file(conf.config_file_arg, &conf, ¶ms); + loglevel = get_loglevel_by_name(conf.loglevel_arg); } - loglevel = get_loglevel_by_name(conf.loglevel_arg); init_mixers(); m = get_mixer_or_die(); ret = m->open(conf.mixer_device_arg, &h);