X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fade.c;h=c86b938532022b4aea628cfb0299e4a6510b4d2e;hp=a3805187fdfbfc07b63fe5fa834f9371abcf7e70;hb=23c74bcff23e2eca0b37dbdb2def8fc132fe36f3;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf

diff --git a/fade.c b/fade.c
index a3805187..c86b9385 100644
--- 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"
@@ -146,7 +149,7 @@ out:
 	close(mixer_fd);
 }
 
-static int client_cmd(const char *cmd,...)
+static void client_cmd(const char *cmd)
 {
 	int ret, fds[3] = {0, 0, 0};
 	pid_t pid;
@@ -155,7 +158,24 @@ static int client_cmd(const char *cmd,...)
 	PARA_INFO_LOG("%s\n", cmdline);
 	ret = para_exec_cmdline_pid(&pid, cmdline, fds);
 	free(cmdline);
-	return ret;
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+	do
+		ret = wait(NULL);
+	while (ret != -1 && errno != ECHILD);
+}
+
+static void change_afs_mode_and_play(char *afs_mode)
+{
+	char *cmd;
+
+	client_cmd("stop");
+	if (!afs_mode)
+		return;
+	cmd = make_message("select %s\n", afs_mode);
+	client_cmd(cmd);
+	free(cmd);
+	client_cmd("play");
 }
 
 /*
@@ -167,16 +187,14 @@ static void sweet_dreams(void)
 	unsigned int delay;
 	struct tm *tm;
 	int min = conf.wake_min_arg;
-	char *fa_stream = conf.fa_stream_arg;
-	char *wake_stream = conf.wake_stream_arg;
-	//char *current_stream = stat_items[STREAM].content;
+	char *fa_mode = conf.fa_mode_arg;
+	char *wake_mode = conf.wake_mode_arg;
+	char *sleep_mode = conf.sleep_mode_arg;
 	int wf = conf.wake_fade_arg;
 	int sf = conf.fa_fade_arg;
 	int wv = conf.wake_vol_arg;
 	int sv = conf.fa_vol_arg;
 	int iv = conf.sleep_ivol_arg;
-	char *cmd, *sleep_stream = conf.sleep_stream_given?
-		conf.sleep_stream_arg : NULL;
 
 	/* calculate wake time */
 	time(&t1);
@@ -191,26 +209,22 @@ static void sweet_dreams(void)
 		tm->tm_min = min;
 		tm->tm_sec = 0;
 	} else {
-		t1 += 8 * 60 * 60;
+		t1 += 9 * 60 * 60; /* nine hours from now */
 		PARA_INFO_LOG("default wake time: %lu\n", t1);
 		tm = localtime(&t1);
 	}
 	wake_time_epoch = mktime(tm);
 	PARA_INFO_LOG("waketime: %s", asctime(tm));
+	client_cmd("stop");
+	sleep(1);
 	if (sf) {
 		PARA_INFO_LOG("initial volume: %d\n", iv);
 		set_vol(iv);
-		cmd = make_message("csp %s\n", fa_stream);
-		client_cmd(cmd);
-		free(cmd);
+		change_afs_mode_and_play(fa_mode);
 		fade(sv, sf);
-	}
-	if (sleep_stream) {
-		cmd = make_message("csp %s\n", sleep_stream);
-		client_cmd(cmd);
-		free(cmd);
 	} else
-		client_cmd("stop");
+		set_vol(sf);
+	change_afs_mode_and_play(sleep_mode);
 	if (!wf)
 		return;
 	for (;;) {
@@ -219,15 +233,13 @@ static void sweet_dreams(void)
 			break;
 		delay = wake_time_epoch - t1 - wf;
 		PARA_INFO_LOG("sleeping %u seconds (%u:%02u)\n",
-			delay, delay / 3600, 
+			delay, delay / 3600,
 			(delay % 3600) / 60);
 		sleep(delay);
 	}
-	cmd = make_message("csp %s\n", wake_stream);
-	client_cmd(cmd);
-	free(cmd);
+	change_afs_mode_and_play(wake_mode);
 	fade(wv, wf);
-	PARA_INFO_LOG("%s", "fade complete, returning\n");
+	PARA_INFO_LOG("fade complete, returning\n");
 }
 
 static void snooze(void)
@@ -276,9 +288,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.",