X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mixer.c;h=dda7fc1df729722266db7136733a28ac2391e977;hb=a5a6446fd1af4a0ad03ef06a3c194d37d6a46acd;hp=013f35fe3e37c60db0404bfe0e80eeee95cfc5a0;hpb=be5daec66f163725489f42d512659a8af5c3fd59;p=paraslash.git

diff --git a/mixer.c b/mixer.c
index 013f35fe..dda7fc1d 100644
--- a/mixer.c
+++ b/mixer.c
@@ -187,11 +187,11 @@ static int com_fade(const struct mixer *m)
 }
 EXPORT_CMD(fade);
 
-static void client_cmd(const char *cmd)
+static void run(const char *exe, const char *cmd)
 {
 	int ret, status, fds[3] = {0, 0, 0};
 	pid_t pid;
-	char *cmdline = make_message(BINDIR "/para_client %s", cmd);
+	char *cmdline = make_message("%s %s", exe, cmd);
 
 	PARA_NOTICE_LOG("%s\n", cmdline);
 	ret = para_exec_cmdline_pid(&pid, cmdline, fds);
@@ -215,6 +215,16 @@ fail:
 	exit(EXIT_FAILURE);
 }
 
+static void client_cmd(const char *cmd)
+{
+	run(BINDIR "/para_client", cmd);
+}
+
+static void audioc_cmd(const char *cmd)
+{
+	run(BINDIR "/para_audioc", cmd);
+}
+
 static void change_afs_mode(const char *afs_mode)
 {
 	char *cmd;
@@ -263,6 +273,20 @@ static int set_initial_volume(const struct mixer *m, struct mixer_handle *h)
 	return 1;
 }
 
+static void stop(const struct mixer *m, struct mixer_handle *h)
+{
+	int ret, old_vol = 0;
+
+	ret = m->get(h);
+	if (ret > 0)
+		old_vol = ret;
+	fade(m, h, 0, 3);
+	audioc_cmd("off");
+	client_cmd("stop");
+	audioc_cmd("on");
+	m->set(h, old_vol);
+}
+
 static int com_sleep(const struct mixer *m)
 {
 	time_t t1, wake_time_epoch;
@@ -317,8 +341,7 @@ static int com_sleep(const struct mixer *m)
 	}
 	wake_time_epoch = mktime(tm);
 	PARA_INFO_LOG("waketime: %d:%02d\n", tm->tm_hour, tm->tm_min);
-	client_cmd("stop");
-	sleep(1);
+	stop(m, h);
 	ret = set_initial_volume(m, h);
 	if (ret < 0)
 		goto close_mixer;
@@ -334,7 +357,7 @@ static int com_sleep(const struct mixer *m)
 		change_afs_mode(initial_mood);
 		client_cmd("play");
 		sleep(delay);
-		client_cmd("stop");
+		stop(m, h);
 	}
 	if (fot && fo_mood && *fo_mood) {
 		change_afs_mode(fo_mood);
@@ -352,7 +375,7 @@ static int com_sleep(const struct mixer *m)
 		if (!fot || !fo_mood) /* currently stopped */
 			client_cmd("play");
 	} else if (fot && fo_mood && *fo_mood) /* currently playing */
-		client_cmd("stop");
+		stop(m, h);
 	m->close(&h);
 	if (!fit || !fi_mood || !*fi_mood) /* nothing to do */
 		return 1;
@@ -367,13 +390,12 @@ static int com_sleep(const struct mixer *m)
 		sleep(delay);
 	}
 	change_afs_mode(fi_mood);
-	if (sleep_mood && *sleep_mood) /* currently playing */
-		client_cmd("next");
-	else /* currently stopped */
-		client_cmd("play");
 	ret = open_mixer_and_set_channel(m, &h);
 	if (ret < 0)
 		return ret;
+	if (sleep_mood && *sleep_mood) /* currently playing */
+		stop(m, h);
+	client_cmd("play");
 	ret = fade(m, h, fiv, fit);
 close_mixer:
 	m->close(&h);