Merge commit 'athcx/master'

diff --git a/server.c b/server.c
index 4822ebb5c3066404e46f72b8154acc6f452bde04..5823cb28d5f458e9b885bf6cddb2795275ac3aa9 100644 (file)
--- a/server.c
+++ b/server.c
@@ -228,7 +228,7 @@ void parse_config_or_die(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;

diff --git a/wav_filter.c b/wav_filter.c
index 234324504f30e8bb25e0f7456cffcfb000374319..b7329c48bce647b113638a5609b39de698ef81fd 100644 (file)
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -38,15 +38,15 @@ static void make_wav_header(unsigned int channels, unsigned int samplerate,
        write_u32(headbuf + 4, size - 8);
        memcpy(headbuf + 8, "WAVE", 4);
        memcpy(headbuf + 12, "fmt ", 4);
-       write_u32(headbuf + 16, 16);
-       write_u16(headbuf + 20, 1);     /* format */
+       write_u32(headbuf + 16, 16); /* 16 + extra format bytes (zero) */
+       write_u16(headbuf + 20, 1);     /* format (1 == PCM/uncompressed) */
        write_u16(headbuf + 22, channels);
        write_u32(headbuf + 24, samplerate);
        write_u32(headbuf + 28, bytespersec);
-       write_u16(headbuf + 32, align);
-       write_u16(headbuf + 34, BITS);
-       memcpy(headbuf + 36, "data", 4);
-       write_u32(headbuf + 40, size - 44);
+       write_u16(headbuf + 32, align); /* number of bytes per sample slice */
+       write_u16(headbuf + 34, BITS); /* significant bits per sample */
+       memcpy(headbuf + 36, "data", 4); /* chunk ID */
+       write_u32(headbuf + 40, size - 44); /* chunk size */
 }
 
 static ssize_t wav_convert(char *inbuf, size_t len, struct filter_node *fn)