Merge commit 'remotes/meins/v0.3' into v0.3

[paraslash.git] / fade.c

diff --git a/fade.c b/fade.c
index a3805187fdfbfc07b63fe5fa834f9371abcf7e70..38a6517cd0dbadc47671f00b7c0b3ba2052ec02c 100644 (file)
--- a/fade.c
+++ b/fade.c
@@ -6,6 +6,9 @@
 
 /** \file fade.c a volume fader and alarm clock */
 
+#include <sys/types.h>
+#include <dirent.h>
+
 #include "fade.cmdline.h"
 #include "para.h"
 #include "fd.h"
@@ -276,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, &params);
+       }
        ret = open_mixer();
        if (ret < 0) {
                PARA_EMERG_LOG("can not open mixer device %s.",