Merge remote branch 'boock/master'

diff --git a/afs.c b/afs.c
index c2fd6d52daa58ef4cf0a118ce855898465053f2b..0464eb77de8918f8b38d5a41c5a792212a271c5f 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -468,7 +468,6 @@ again:
        }
        ret = open_and_update_audio_file(aft_row, score, &afd);
        if (ret < 0) {
-               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
                ret = score_delete(aft_row);
                if (ret < 0) {
                        PARA_ERROR_LOG("%s\n", para_strerror(-ret));

diff --git a/aft.c b/aft.c
index 266188b5b370a3e7e3e8aaa092ca093aca7c6c04..b3dde1379997bb6f69647255d0ac53fb703fce09 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -1136,6 +1136,8 @@ int open_and_update_audio_file(struct osl_row *aft_row, long score,
 err:
        free(afd->afhi.chunk_table);
        osl_close_disk_object(&chunk_table_obj);
+       if (ret < 0)
+               PARA_ERROR_LOG("%s: %s\n", path, para_strerror(-ret));
        return ret;
 }
 

diff --git a/audiod.cmd b/audiod.cmd
index 7ffe98e7d249368992568f42dcb1bc816eb7afb5..759f19173c111ac3aeff55b660eefc1c8b1d58da 100644 (file)
--- a/audiod.cmd
+++ b/audiod.cmd
@@ -14,7 +14,7 @@ H: on -> standby -> off -> on
 N: grab
 D: grab the audio stream
 L:
-U: -- grab [-m[{s|p|a}]] [-p=<parent>] [-n=<name>] [-o]
+U: -- grab [-m[{s|p|a}]] [-p=PARENT] [-n=NAME] [-o]
 H:
 H: grab ('splice') the audio stream at any position in the buffer
 H: tree and send that data back to the client.
@@ -35,7 +35,7 @@ H:    ready for writing (i.e. would block). Sloppy mode ignores
 H:     the write, pedantic mode aborts and aggressive mode tries
 H:     to write anyway.
 H:
-H: -p  Grab output of node <parent> of the buffer tree.
+H: -p  Grab output of node PARENT of the buffer tree.
 H:
 H: -n  Name of the new buffer tree node. Defaults to 'grab'.
 H:

diff --git a/stdin.h b/stdin.h
index 2d279a6eada30d55efe51fce50798fdaf4700239..32a4c281b8326c6705c41d5e67c44c9e09de3434 100644 (file)
--- a/stdin.h
+++ b/stdin.h
@@ -12,7 +12,7 @@ struct stdin_task {
        struct task task;
        /** Stdin is always the root of a buffer tree. */
        struct btr_node *btrn;
-       /* Use a buffer pool to minimize memcpy due to alignment problems. */
+       /** Use a buffer pool to minimize memcpy due to alignment problems. */
        struct btr_pool *btrp;
 };