X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fade.c;h=8ee192cd177bd65e4f886cd39c29ab9498cb69a2;hp=cbfb62308a79ab85aa73b2d3f88c77cb25a6c725;hb=f78b535b0d7863152b7ca463b2b499485f4ea1a7;hpb=0968b226713f7bab3be9185b426f766932394bc7

diff --git a/fade.c b/fade.c
index cbfb6230..8ee192cd 100644
--- a/fade.c
+++ b/fade.c
@@ -25,12 +25,15 @@ DECLARE_MIXER_INITS;
 static struct mixer supported_mixer[] = {MIXER_ARRAY};
 #define FOR_EACH_MIXER(i) for ((i) = 0; (i) < NUM_SUPPORTED_MIXERS; (i)++)
 
-__printf_2_3 void date_log(__a_unused int ll, const char *fmt, ...)
+static int loglevel;
+__printf_2_3 void date_log(int ll, const char *fmt, ...)
 {
 	va_list argp;
 	time_t t1;
 	struct tm *tm;
 
+	if (ll < loglevel)
+		return;
 	time(&t1);
 	tm = localtime(&t1);
 	printf("%d:%02d:%02d ", tm->tm_hour, tm->tm_min, tm->tm_sec);
@@ -49,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);
@@ -86,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) {
@@ -309,6 +312,7 @@ 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);
 	init_mixers();
 	m = get_mixer_or_die();
 	ret = m->open(conf.mixer_device_arg, &h);