X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fade.c;h=f269f0292fbf31be9f48673314beee6c14cb8c05;hp=d21ff4036778767a8801da9fac0d36517b3dfdae;hb=51cab2aba416fc1d57336f4e72da6b76ec60174c;hpb=2bca38fbb97e6c5371591eb754b79cc12525aba0

diff --git a/fade.c b/fade.c
index d21ff403..f269f029 100644
--- a/fade.c
+++ b/fade.c
@@ -1,23 +1,14 @@
 /*
  * Copyright (C) 1998-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \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"
@@ -170,6 +161,19 @@ static int client_cmd(const char *cmd,...)
 	return ret;
 }
 
+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");
+}
+
 /*
  * sleep
  */
@@ -179,16 +183,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);
@@ -203,26 +205,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 (;;) {
@@ -231,15 +229,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)
@@ -288,9 +284,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.",