X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=6aa7c1f4c597fd92d4574aa43f3742604e6c9df9;hp=7da05898b69b528563fc0e902f0568c0728752a8;hb=a584fc87a0e2ab02168fe63a5571f0b5b48698c2;hpb=b17c70f1f96ca624064dd5202c54be55ed4d71c6

diff --git a/server.c b/server.c
index 7da05898..6aa7c1f4 100644
--- a/server.c
+++ b/server.c
@@ -12,8 +12,9 @@
  *
  * Starting points for getting an overview:
  *
+ *
  * 	- The main programs: \ref server.c, \ref audiod.c, \ref client.c,
- *	  \ref audioc.c, \ref fsck.c,
+ *	  \ref audioc.c, \ref fsck.c, \ref afh.c
  *	- Server: \ref server_command, \ref sender,
  *	- Audio file selector: \ref audio_format_handler, \ref mood, \ref afs_table,
  *	- Client: \ref receiver, \ref receiver_node, \ref filter, \ref filter_node.
@@ -21,9 +22,9 @@
  *
  * The gory details, listed by topic:
  *
- * 	- Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c,
- * 	- Decoders: \ref mp3dec.c, \ref oggdec.c, \ref aacdec.c,
- *	- Volume normalizer: \ref compress.c,
+ * 	- Audio format handlers: \ref send_common.c \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c,
+ * 	- Decoders: \ref mp3dec_filter.c, \ref oggdec_filter.c, \ref aacdec_filter.c,
+ *	- Volume normalizer: \ref compress_filter.c,
  *	- Output: \ref alsa_write.c, \ref osx_write.c,
  * 	- http: \ref http_recv.c, \ref http_send.c,
  *	- ortp: \ref ortp_recv.c, \ref ortp_send.c,
@@ -135,7 +136,7 @@ struct server_command_task {
  * \param ll The log level.
  * \param fmt The format string describing the log message.
  */
-void para_log(int ll, const char* fmt,...)
+__printf_2_3 void para_log(int ll, const char* fmt,...)
 {
 	va_list argp;
 	FILE *outfd;
@@ -225,7 +226,7 @@ static void parse_config(int override)
 			.initialize = 0,
 			.check_required = 1,
 			.check_ambiguity = 0,
-			.print_errors = 1
+			.print_errors = !conf.daemon_given
 		};
 		server_cmdline_parser_config_file(cf, &conf, &params);
 		conf.daemon_given = tmp;
@@ -492,9 +493,9 @@ static void server_init(int argc, char **argv)
 		daemon_init();
 	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
-	init_signal_task();
 	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	afs_socket = init_afs();
+	init_signal_task();
 	PARA_NOTICE_LOG("initializing virtual streaming system\n");
 	init_vss_task(afs_socket);
 	init_server_command_task(argc, argv);