Merge branch 't/write_consolidation'

This topic branch has been cooking in next for two weeks with no
problems.

diff --git a/NEWS b/NEWS
index 16e8e4e8cf2dba2709b75b612d386434838609ff..f14f2879a8f61726f1c2464d4498b2f771e510c7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,13 @@
 0.4.10 (to be announced) "heterogeneous vacuum"
 -----------------------------------------------
 
+       - The --no_default_filters option of para_filter has been
+         depricated. It still works but has no effect and will be
+         removed in the next version.
+
+        - Cleanup and consolidation of the various wrappers for
+          write(), writev(), send() and friends.
+
 -------------------------------------
 0.4.9 (2011-12-06) "hybrid causality"
 -------------------------------------

diff --git a/audiod.c b/audiod.c
index a78757b6fead348359b66b641cae528e9c25d95a..d7765e21c4224d8ff2419f45521effb62cd50492 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -918,8 +918,10 @@ static int parse_filter_args(void)
 {
        int i, j, ret, af_mask;
 
-       if (!conf.no_default_filters_given)
-               return init_default_filters();
+       if (conf.no_default_filters_given) {
+               PARA_WARNING_LOG("--no_default_filters is deprecated\n");
+               PARA_WARNING_LOG("It has no effect and will be removed soon\n");
+       }
        for (i = 0; i < conf.filter_given; i++) {
                char *arg;
                ret = parse_stream_command(conf.filter_arg[i], &arg);

diff --git a/client.c b/client.c
index 2242d40e3589fd7211eae249e04b53869c102fd7..0ae015139fc915d5446cbb58b6eacf78d2d9eb2a 100644 (file)
--- a/client.c
+++ b/client.c
@@ -601,7 +601,7 @@ int main(int argc, char *argv[])
         */
        sit.btrn = btr_new_node(&(struct btr_node_description)
                EMBRACE(.name = "stdin"));
-       ret = client_open(argc, argv, &ct, &client_loglevel, sit.btrn, NULL, &sched);
+       ret = client_connect(ct, &sched, sit.btrn, NULL);
        if (ret < 0)
                goto out;
        sot.btrn = btr_new_node(&(struct btr_node_description)

diff --git a/ggo/audiod.m4 b/ggo/audiod.m4
index 1fe169591deccc867c2fd7ad40616af2379a51ce..1bc5db14e5ec35bb6de27bed651ac66da76c2713 100644 (file)
--- a/ggo/audiod.m4
+++ b/ggo/audiod.m4
@@ -144,40 +144,37 @@ details="
 
 option "no_default_filters" D
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"Configure filters manually"
+"deprecated"
 flag off
 details = "
-       If (and only if) this option is set, the --filter options
-       (see below) take effect. Otherwise, the compiled-in defaults
-       apply.  These defaults depend on the receiver being used as
-       described below.
-
-       For http streams, only a single filter per audio format,
-       the decoder for that format, is activated. On the other hand,
-       since udp and dccp streams are sent fec-encoded by para_server,
-       the client side must feed the output of the receiver into
-       the fecdec filter first. Therefore the default for udp and
-       dccp streams is to activate the fecdec filter, followed by
-       the appropriate decoder.
-
-       You must give this option if you want to use any other filter,
-       for example the amp or the compress filter.
-
+       This option is was deprecated in paraslash-0.4.10 and has no
+       effect any more. It will be removed in the next version.
 "
 
 option "filter" f
 #~~~~~~~~~~~~~~~~
-"Use non-default filters"
-string typestr="filter_spec"
+"Specify the filter configuration."
+string typestr = "filter_spec"
 optional
 multiple
-dependon="no_default_filters"
-details="
+details = "
        This option may be given multiple times. The \"filter_spec\"
        consists of an audio format specifier (see above), the name
        of the filter, and any options for that filter. Note that
        order matters.
 
+       The compiled-in defaults apply to all audio formats for which
+       no --filter option was given. These defaults depend on the
+       receiver being used.
+
+       For HTTP streams, only the decoder for the current audio
+       format is activated. UDP and DCCP streams, on the other
+       hand, are sent FEC-encoded by para_server. In order to play
+       such streams, the receiver output must be FEC-decoded first,
+       i.e. fed to the fecdec filter. Therefore the default for UDP
+       and DCCP streams is to activate the fecdec filter, followed
+       by the decoding filter for the audio format.
+
        Examples:
 
                --filter 'mp3:mp3dec'

diff --git a/grab_client.c b/grab_client.c
index 729c8193a90d7f21edefa6b83b4f35db169bbbc6..07f779bd172ac5f83f78d53e133881b94cc54ef3 100644 (file)
--- a/grab_client.c
+++ b/grab_client.c
@@ -140,7 +140,7 @@ static void gc_activate(struct grab_client *gc, struct sched *s)
 /**
  * Activate inactive grab clients if possible.
  *
- * \param sched Needed to schedule the grab client task.
+ * \param s Needed to schedule the grab client task.
  *
  * This is called from audiod.c when the current audio file changes. It loops
  * over all inactive grab clients and checks each grab client's configuration

diff --git a/web/manual.m4 b/web/manual.m4
index 041457e6157a585cd479edba8e65ab45fcd5e207..e665ea7bf99f183ea0a1479386f580cba7feb113 100644 (file)
--- a/web/manual.m4
+++ b/web/manual.m4
@@ -494,7 +494,7 @@ including ssh and gpg. An RSA key consists in fact of two keys,
 called the public key and the private key. A message can be encrypted
 with either key and only the counterpart of that key can decrypt
 the message. While RSA can be used for both signing and encrypting
-a message, paraslash only uses RSA only for the latter purpose. The
+a message, paraslash uses RSA only for the latter purpose. The
 RSA public key encryption and signatures algorithms are defined in
 detail in RFC 2437.