buffer_tree: Add code to splice out a node of the buffer tree.

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index f7aad89841306a3e4e431b039584f86822d82474..edd382711d0c058e41f7a731a38e8c47cab0883a 100644 (file)
--- a/server.c
+++ b/server.c
@@ -22,10 +22,12 @@
  *
  * 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);