X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fade.c;h=e6f550a1c94d37806b28b25b8ac17bf5b7bd10ed;hp=2954fa32689887e9b8703f0eb34c29e710e6c072;hb=b01605d7062e4d1f005d5aaaaed158d8efe06d79;hpb=3764561bd59cac22aa4c8f5ea811eebc140af51b

diff --git a/fade.c b/fade.c
index 2954fa32..e6f550a1 100644
--- a/fade.c
+++ b/fade.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1998-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -52,7 +52,7 @@ static int fade(struct mixer *m, struct mixer_handle *h, int new_vol, int fade_t
 	unsigned long long tmp, tmp2; /* Careful with that axe, Eugene! */
 
 	if (fade_time <= 0)
-		return 1;
+		return m->set(h, new_vol);
 	secs = fade_time;
 	PARA_NOTICE_LOG("fading to %d in %d seconds\n", new_vol, secs);
 	ret = m->get(h);
@@ -89,7 +89,7 @@ static void client_cmd(const char *cmd)
 	pid_t pid;
 	char *cmdline = make_message(BINDIR "/para_client %s", cmd);
 
-	PARA_INFO_LOG("%s\n", cmdline);
+	PARA_NOTICE_LOG("%s\n", cmdline);
 	ret = para_exec_cmdline_pid(&pid, cmdline, fds);
 	free(cmdline);
 	if (ret < 0) {
@@ -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, &params);
+		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);