X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=d9460934b0f22182bad0ba49e44b797862266fa8;hp=767afa8dec4b4e607b82e244b10c71d71d049e1f;hb=1e012cf40238883621692051a22fb9c7cad5e944;hpb=337d7784b0f8bc30b1fa9af56ace503acd97d40d

diff --git a/audiod.c b/audiod.c
index 767afa8d..d9460934 100644
--- a/audiod.c
+++ b/audiod.c
@@ -5,19 +5,23 @@
  */
 
 /** \file audiod.c the paraslash's audio daemon */
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <signal.h>
+#include <openssl/rc4.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
+#include "crypt.h"
 #include "audiod.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
 #include "recv.h"
+#include "buffer_tree.h"
 #include "filter.h"
-#include "grab_client.cmdline.h"
 #include "grab_client.h"
 #include "client.cmdline.h"
 #include "client.h"
@@ -160,7 +164,7 @@ struct command_task {
  * \return The audio format number on success, -E_UNSUPPORTED_AUDIO_FORMAT if
  * \a name is not a supported audio format.
  */
-int get_audio_format_num(char *name)
+int get_audio_format_num(const char *name)
 {
 	int i;
 
@@ -310,6 +314,7 @@ static void close_receiver(int slot_num)
 	a->receiver->close(s->receiver_node);
 	free(s->receiver_node);
 	s->receiver_node = NULL;
+	stat_task->current_audio_format_num = -1;
 }
 
 static void kill_all_decoders(int error)
@@ -384,8 +389,8 @@ static void open_filters(int slot_num)
 	s->fc->inbufp = &s->receiver_node->buf;
 	s->fc->in_loaded = &s->receiver_node->loaded;
 	s->fc->input_error = &s->receiver_node->task.error;
-	s->fc->task.pre_select = filter_pre_select;
-	s->fc->task.post_select = NULL;
+	s->fc->task.pre_select = NULL;
+	s->fc->task.post_select = filter_post_select;
 	s->fc->task.error = 0;
 	s->fc->num_filters = nf;
 
@@ -443,7 +448,7 @@ static void open_writers(int slot_num)
 		stat_task->server_stream_start : *now;
 	s->offset_seconds = stat_task->offset_seconds;
 	s->seconds_total = stat_task->length_seconds;
-	activate_inactive_grab_clients(slot_num, s->format, s->fc);
+	activate_inactive_grab_clients(s->format, s->fc);
 }
 
 static int open_receiver(int format)
@@ -900,8 +905,15 @@ static void command_post_select(struct sched *s, struct task *t)
 {
 	int ret;
 	struct command_task *ct = container_of(t, struct command_task, task);
+	static struct timeval last_status_dump;
+	struct timeval tmp;
+
+	tv_add(&last_status_dump, &(struct timeval){0, 500 * 1000}, &tmp);
+	if (tv_diff(&tmp, now, NULL) < 0) {
+		audiod_status_dump();
+		last_status_dump = *now;
+	}
 
-	audiod_status_dump();
 	if (!FD_ISSET(ct->fd, &s->rfds))
 		return;
 	ret = handle_connect(ct->fd);
@@ -928,6 +940,7 @@ static void close_stat_pipe(void)
 	stat_task->length_seconds = 0;
 	stat_task->offset_seconds = 0;
 	stat_task->vss_status = 0;
+	stat_task->current_audio_format_num = -1;
 	audiod_status_dump();
 }
 
@@ -1194,9 +1207,12 @@ int main(int argc, char *argv[])
 	drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	parse_config_or_die();
 	init_colors_or_die();
+	init_random_seed_or_die();
 	daemon_set_flag(DF_LOG_TIME);
 	daemon_set_flag(DF_LOG_HOSTNAME);
 	daemon_set_flag(DF_LOG_LL);
+	if (conf.log_timing_given)
+		daemon_set_flag(DF_LOG_TIMING);
 	if (conf.logfile_given) {
 		daemon_set_logfile(conf.logfile_arg);
 		daemon_open_log_or_die();
@@ -1225,7 +1241,7 @@ int main(int argc, char *argv[])
 	register_task(&cmd_task->task);
 	register_task(&stat_task->task);
 	s.default_timeout.tv_sec = 0;
-	s.default_timeout.tv_usec = 99 * 1000;
+	s.default_timeout.tv_usec = 999 * 1000;
 	ret = schedule(&s);
 
 	PARA_EMERG_LOG("%s\n", para_strerror(-ret));