Merge branch 'master' into aac

diff --git a/alsa_writer.c b/alsa_writer.c
index 039c9817a99f13caa5980247e1d481615755680b..601353aaac84b7a8969d4bf9b5dc01d68242de19 100644 (file)
--- a/alsa_writer.c
+++ b/alsa_writer.c
@@ -40,8 +40,10 @@ extern struct gengetopt_args_info conf;
 
 /** data specific to the alsa writer */
 struct private_alsa_data {
-       snd_pcm_t *handle;
-       size_t bytes_per_frame;
+/** the alsa handle */
+snd_pcm_t *handle;
+/** determined and set by alsa_open() */
+size_t bytes_per_frame;
 };
 
 /*
@@ -172,6 +174,7 @@ static void alsa_close(struct writer_node *wn)
        free(pad);
 }
 
+/** the init function of the alsa writer */
 void alsa_writer_init(struct writer *w)
 {
        w->open = alsa_open;

diff --git a/audiod.c b/audiod.c
index 61711dc3f5591d9396ebe62496871404834dea47..a78ccd68a8e4dddd912f7f6ee6933ad092e29ea1 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -809,7 +809,7 @@ static void check_stat_line(char *line)
        long unsigned sec, usec;
        char *tmp;
 
-       PARA_INFO_LOG("line: %s\n", line);
+//     PARA_INFO_LOG("line: %s\n", line);
        if (!line)
                return;
        itemnum = stat_line_valid(line);
@@ -1561,6 +1561,7 @@ static void __noreturn audiod_mainloop(void)
 repeat:
        FD_ZERO(&wfds);
        FD_ZERO(&rfds);
+       max_fileno = -1;
        /* always check signal pipe and the local socket */
        para_fd_set(signal_pipe, &rfds, &max_fileno);
        para_fd_set(audiod_socket, &rfds, &max_fileno);
@@ -1643,7 +1644,6 @@ int __noreturn main(int argc, char *argv[])
        char *cf;
        int i;
 
-       fprintf(stderr, "argc: %d\n", argc);
        valid_fd_012();
        hostname = para_hostname();
        cmdline_parser(argc, argv, &conf);

diff --git a/compress.c b/compress.c
index b4e4c40a7a1663c95b38cdbada69715c519da5dc..3e605d0e091a2bf4ffcfb99f21adf19550188036 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -67,8 +67,8 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
                                >> gain_shift;
                        if (unlikely(adjusted_sample > 32767)) {
                                adjusted_sample = 32767;
-                               pcd->current_gain = (pcd->current_gain +
-                                       (1 << pcd->conf->inertia_arg)) / 2;
+                               pcd->current_gain = (3 * pcd->current_gain +
+                                       (1 << pcd->conf->inertia_arg)) / 4;
                                pcd->peak = 0;
                        } else
                                if (adjusted_sample > pcd->peak)
@@ -78,8 +78,8 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
                                >> gain_shift);
                        if (unlikely(adjusted_sample < -32768)) {
                                adjusted_sample = -32768;
-                               pcd->current_gain = (pcd->current_gain +
-                                       (1 << pcd->conf->inertia_arg)) / 2;
+                               pcd->current_gain = (3 * pcd->current_gain +
+                                       (1 << pcd->conf->inertia_arg)) / 4;
                                pcd->peak = 0;
                        } else
                                if (-adjusted_sample > pcd->peak)

diff --git a/file_writer.c b/file_writer.c
index dabe92ce37fb941909a3286fe0575ef9e23e260d..a7a765e1175c6379e1881973faa9553255a3cd40 100644 (file)
--- a/file_writer.c
+++ b/file_writer.c
@@ -23,9 +23,12 @@
 #include "string.h"
 #include "error.h"
 
+/** data specific to the file writer */
 struct private_file_writer_data {
-       int fd;
+/** the file descriptor of the output file */
+int fd;
 };
+
 static int file_writer_open(struct writer_node *w)
 {
        struct private_file_writer_data *pfwd = para_calloc(
@@ -60,6 +63,7 @@ static void file_writer_close(struct writer_node *wn)
        free(pfwd);
 }
 
+/** the init function of the file writer */
 void file_writer_init(struct writer *w)
 {
        w->open = file_writer_open;

diff --git a/write.h b/write.h
index 102f1b25cb3c4bdaea12d0820e0e3b4af4175db8..5f8ab3ab142eff3cbd89189ede339fd4ef413b40 100644 (file)
--- a/write.h
+++ b/write.h
@@ -18,33 +18,91 @@
 
 /** \file write.h writer-related structures */
 
+/** the list of supported writers */
 enum writer_enum {WRITER_ENUM};
 
+/**
+ * decbribes one running instance of a writer
+ */
 struct writer_node {
+/** points to the writer structure associated with this node */
        struct writer *writer;
+/** writer-specific data */
        void *private_data;
+/** send that many bytes in one go */
        int chunk_bytes;
 };
 
+/** describes one supported writer */
 struct writer {
-       void (*init)(struct writer *w);
-       int (*open)(struct writer_node *);
-       int (*write)(char *data, size_t nbytes, struct writer_node *);
-       void (*close)(struct writer_node *);
-       void (*shutdown)(struct writer_node *);
+/**
+ * the init function of the writer
+ *
+ * It must fill in all other function pointers of the given
+ * writer structure.
+ *
+ */
+void (*init)(struct writer *w);
+/**
+ *
+ * open one instance of this writer
+ *
+ * This function should perform any work necessary to write the incoming
+ * stream. If To this aim, it may allocate its private data structure and store
+ * a pointer to that structure via the given writer_node paramenter.
+ */
+int (*open)(struct writer_node *);
+/**
+ *
+ * write a chunk of audio data
+ *
+ * This is called from the driving application whenever a data block of \a
+ * chunk_bytes is available. It must return the number of bytes consumed from
+ * \a data on success, and negative on errors.
+ *
+ */
+int (*write)(char *data, size_t nbytes, struct writer_node *);
+/**
+ * close one instance of the writer
+ *
+ * This function is assumed to succeed.
+ */
+void (*close)(struct writer_node *);
+/**
+ * shutdown the writer
+ *
+ * This is a optional function pointer used for cleaning
+ * up.
+ */
+void (*shutdown)(struct writer_node *);
 };
 
+/**
+ * describes a set of writer nodes that all write the same stream.
+ */
 struct writer_node_group {
-       unsigned num_writers;
-       struct writer_node *writer_nodes;
-       int *written;
-       size_t max_chunk_bytes;
-       int eof;
+/** number of nodes belonging to this group */
+unsigned num_writers;
+/** array of pointers to the corresponding writer nodes */
+struct writer_node *writer_nodes;
+/** keeps track of how many bytes have been written by each node */
+int *written;
+/** the maximum of the chunk_bytes values of the writer nodes in this group */
+size_t max_chunk_bytes;
+/** non-zero if end of file was encountered */
+int eof;
 };
 
+/** loop over each writer node in a writer group */
 #define FOR_EACH_WRITER_NODE(i, wng) for (i = 0; i < (wng)->num_writers; i++)
+/** loop over each supported writer */
 #define FOR_EACH_WRITER(i) for (i = 0; i < NUM_SUPPORTED_WRITERS; i++)
 
+/** declare the init functions of all supported writers */
 DECLARE_WRITER_INITS;
+
+/** array containing the name of each writer */
 extern const char *writer_names[];
+
+/** the writer structure for each supported writer */
 extern struct writer writers[NUM_SUPPORTED_WRITERS];