X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=31123302ab239172980d51ebb73ef2822487ff5f;hp=f7aad89841306a3e4e431b039584f86822d82474;hb=96126295f6d4218fb2b517809455b9c993f8c069;hpb=05527588bd503e4748d801b641a9e3a6556525ad

diff --git a/server.c b/server.c
index f7aad898..31123302 100644
--- a/server.c
+++ b/server.c
@@ -16,16 +16,18 @@
  * 	- The main programs: \ref server.c, \ref audiod.c, \ref client.c,
  *	  \ref audioc.c, \ref afh.c
  *	- Server: \ref server_command, \ref sender,
- *	- Audio file selector: \ref audio_format_handler, \ref mood, \ref afs_table,
+ *	- Audio file selector: \ref audio_format_handler, \ref afs_table,
  *	- Client: \ref receiver, \ref receiver_node, \ref filter, \ref filter_node.
  *
  *
  * The gory details, listed by topic:
  *
- * 	- 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,
+ * 	- Audio format handlers: \ref send_common.c \ref mp3_afh.c,
+ *	  \ref ogg_afh.c, \ref aac_afh.c, \ref wma_afh.c,
+ * 	- Decoders: \ref mp3dec_filter.c, \ref oggdec_filter.c,
+ *	  \ref aacdec_filter.c, \ref wmadec_filter.c,
  *	- Volume normalizer: \ref compress_filter.c,
- *	- Output: \ref alsa_write.c, \ref osx_write.c,
+ *	- Output: \ref alsa_write.c, \ref osx_write.c, \ref oss_write.c,
  * 	- http: \ref http_recv.c, \ref http_send.c,
  *	- udp: \ref udp_recv.c, \ref udp_send.c,
  *	- dccp: \ref dccp_recv.c, \ref dccp_send.c,
@@ -57,7 +59,7 @@
  *	- Ring buffer: \ref ringbuffer.c, \ref ringbuffer.h,
  *	- Hashing: \ref hash.h, \ref sha1.h, \ref sha1.c,
  *	- Crypto: \ref crypt.c.
- *	- Forward error correction: \ref fec.c
+ *	- Forward error correction: \ref fec.c.
  */
 
 #include <signal.h>
@@ -243,6 +245,8 @@ void parse_config_or_die(int override)
 	daemon_set_flag(DF_LOG_PID);
 	daemon_set_flag(DF_LOG_LL);
 	daemon_set_flag(DF_LOG_TIME);
+	if (conf.log_timing_given)
+		daemon_set_flag(DF_LOG_TIMING);
 	ret = 1;
 out:
 	free(cf);