Merge branch 't/fade_improvements'

Was cooking for almost a month, let's merge it.

	483d31 fade: Upgrade client command log message to loglevel NOTICE.
	49412f fade: Handle non-positive fade time gracefully.
	376456 fade: Add --loglevel option.
	dec704 fade: Generate fade.ggo from m4 template.
	0968b2 fade: Introduce --mixer-api to choose between ALSA and OSS.
	b4171b fade: Add the ALSA mixer implementation.
	46af7d fade: Switch to modular mixer API.
	702457 fade: Infrastructure for the modular mixer API.
	3a2580 fade: Abort on client command failures.
	b618da fade: Remove some unnecessary includes.
	f502e6 configure: Add fade.o to object list only if oss was detected.

diff --git a/NEWS b/NEWS
index 6ee5086a41f3abd4b406448be51d459af9717cec..2c05b8f90be044f7070ef5a2a08a589e4d46b58d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@
          in the new "releases" branch.
        - Overhaul of the build system: All generated files are now
          written to the "build" directory.
+       - The modular mixer API and the alsa mixer.
 
 --------------------------------------
 0.4.11 (2012-07-20) "mutual diversity"

diff --git a/amp_filter.c b/amp_filter.c
index dd2c61949da4877a88ef4ca468fb6bf4be7e6b7e..2edfdd5879913ab9c66c8146e81e5c6a508f257f 100644 (file)
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -23,7 +23,6 @@ extern char *stat_item_values[NUM_STAT_ITEMS];
 /** Data specific to the amplify filter. */
 struct private_amp_data {
        /** Points to the configuration data for this instance of this filter. */
-       struct amp_filter_args_info *conf;
        /** Amplification factor. */
        unsigned amp;
 };
@@ -53,14 +52,14 @@ err:
 static void amp_open(struct filter_node *fn)
 {
        struct private_amp_data *pad = para_calloc(sizeof(*pad));
+       struct amp_filter_args_info *conf = fn->conf;
 
-       pad->conf = fn->conf;
        fn->private_data = pad;
        fn->min_iqs = 2;
-       if (!pad->conf->amp_given && stat_item_values[SI_AMPLIFICATION])
+       if (!conf->amp_given && stat_item_values[SI_AMPLIFICATION])
                sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp);
        else
-               pad->amp = pad->conf->amp_arg;
+               pad->amp = conf->amp_arg;
        PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
                pad->amp, pad->amp / 64.0 + 1.0);
 }

diff --git a/buffer_tree.c b/buffer_tree.c
index 5756898bced710406b3c68b8cb1e5cc85a992183..63be36d7a10042c5f21b6a95677cdea369ffa12c 100644 (file)
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -602,7 +602,7 @@ static size_t btr_get_buffer_by_reference(struct btr_buffer_reference *br, char
  *
  * \param btrn The node whose input queue is to be queried.
  * \param omit Number of bytes to be omitted.
- * \param bufp Result pointer.
+ * \param bufp Result pointer. It is OK to pass \p NULL here.
  *
  * If a buffer tree node needs more input data but can not consume the data it
  * already has (because it might be needed again later) this function can be
@@ -878,7 +878,7 @@ size_t btr_get_output_queue_size(struct btr_node *btrn)
 }
 
 /**
- * Execute a inter-node command on the given node or on a parent node.
+ * Execute an inter-node command on the given node or on a parent node.
  *
  * \param btrn The node to start looking.
  * \param command The command to execute.

diff --git a/configure.ac b/configure.ac
index 93b60e641b9e3d31d9146ef996798a1507a16766..32ad846d77e03891d9d57648ba0faa8ef08fc55c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -793,7 +793,7 @@ if test "$have_flac" = "yes"; then
        audiod_audio_formats="$audiod_audio_formats flac"
        AC_SUBST(flac_cppflags)
 else
-       AC_MSG_WARN([no flac support in para_audiod/para_filter])
+       AC_MSG_WARN([no flac support in para_audiod/para_filter/para_afh/para_server])
 fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"