Merge branch 't/doc'

diff --git a/NEWS b/NEWS
index 36bc0af059dd5920c7e5b427ded0a6595601191f..227bf7fbace180daf659df638f21b7fce7b6874f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ NEWS
 0.4.3 (to be announced) "imaginary radiation"
 ---------------------------------------------
 
+       - Fix an end-of-file detection bug in the oggdec filter.
+
 ------------------------------------------
 0.4.2 (2010-04-23) "associative expansion"
 ------------------------------------------

diff --git a/audiod.c b/audiod.c
index 380e53e0fbae30cf9c949afea6d247d71396eb37..4a4a2ae70d307c6db2ca8779190277e6a8085271 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -191,7 +191,7 @@ int get_audio_format_num(const char *name)
  * It has to to take into account that probably the stream was not started at
  * the beginning of the file, that the clock between the server and the client
  * host may differ and that playback of the stream was delayed, e.g. because
- * the prebuffer filter is used in the filter chain of the given slot.
+ * the prebuffer filter is used in the filter configuration of the given slot.
  *
  * If no writer is active in the given slot, or \a slot_num is negative
  * (indicating that para_audiod runs in standby mode), an approximation based

diff --git a/buffer_tree.c b/buffer_tree.c
index 9884c2e2ff1b1fc4661bab71b585bede6d2eba6a..1b859f520ebf4aa16d0a13df897395d97da423d9 100644 (file)
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -783,15 +783,6 @@ size_t btr_get_output_queue_size(struct btr_node *btrn)
        return max_size;
 }
 
-int btr_exec(struct btr_node *btrn, const char *command, char **value_result)
-{
-       if (!btrn)
-               return -ERRNO_TO_PARA_ERROR(EINVAL);
-       if (!btrn->execute)
-               return -ERRNO_TO_PARA_ERROR(ENOTSUP);
-       return btrn->execute(btrn, command, value_result);
-}
-
 /**
  * Execute a inter-node command on a parent node.
  *

diff --git a/error.h b/error.h
index 3ad88cd4fab44cf7a2527bdcbf905b7d2eaf82da..d92c9d6e553f5ddc79a6a57e1dc3fac19c1b2c13 100644 (file)
--- a/error.h
+++ b/error.h
@@ -89,7 +89,7 @@ extern const char **para_errlist[];
 
 
 #define WAV_FILTER_ERRORS \
-       PARA_ERROR(WAV_BAD_FC, "invalid filter chain configuration"), \
+       PARA_ERROR(WAV_BAD_FC, "invalid filter configuration"), \
        PARA_ERROR(WAV_EOF, "wav filter: end of file"), \
        PARA_ERROR(WAV_SUCCESS, "successfully wrote wav header"), \
 

diff --git a/ggo/audiod.m4 b/ggo/audiod.m4
index 7ff8806ce47d876fab497fd4181f4052629758bd..289917c3fddfb96debfd9e8425b005b97276b532 100644 (file)
--- a/ggo/audiod.m4
+++ b/ggo/audiod.m4
@@ -146,12 +146,12 @@ details="
        the amp filter or the compress filter which are not activated
        by default.
 
-       Playing udp streams also requires manual filter configuration
-       because the output of the udp receiver must be fed into the
-       fecdec filter first to produce a stream which can be decoded
-       by the appropriate decoder (mp3dec, oggdec, aacdec). In other
-       words, the fecdec filter must be specified as the first filter
-       of the filter chain for any udp stream.
+       Playing udp streams also requires that the output of the udp
+       receiver must be fed into the fecdec filter first to produce
+       a stream which can be decoded by the appropriate decoder
+       (mp3dec, oggdec, aacdec, wmadec). In other words, the fecdec
+       filter should be specified as the first filter of the filter
+       configuration for udp streaming.
 "
 
 option "filter" f

diff --git a/mood.c b/mood.c
index c03867c1b86a27551f24c5b97a608f9e1107d2e8..d24eac912161f5d51c27ea020c08fccddb2f066a 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -873,7 +873,7 @@ out:
  *
  * \sa mood_open(), mood_close().
  */
-int reload_current_mood(void)
+static int reload_current_mood(void)
 {
        int ret;
        char *mood_name = NULL;

diff --git a/mood.h b/mood.h
index 4a4d206e4678137b1e2f3ae19373314bf51683a5..5ef01489dd8bba3128cf5b5967bcf43d27cd92b2 100644 (file)
--- a/mood.h
+++ b/mood.h
@@ -8,5 +8,4 @@
 
 int change_current_mood(char *mood_name);
 void close_current_mood(void);
-int reload_current_mood(void);
 void mood_check_callback(int fd, __a_unused const struct osl_object *query);

diff --git a/oss_write.c b/oss_write.c
index 10a64497d58b9c024aa9d1097bd7976da3b79883..d0cff0150bf9c7690ffe2eb37f0a55b46d142c00 100644 (file)
--- a/oss_write.c
+++ b/oss_write.c
@@ -53,7 +53,8 @@ static void oss_close(struct writer_node *wn)
 {
        struct private_oss_write_data *powd = wn->private_data;
 
-       close(powd->fd);
+       if (powd->fd >= 0)
+               close(powd->fd);
        free(powd);
 }
 
@@ -137,7 +138,7 @@ static int oss_init(struct writer_node *wn, unsigned samplerate, unsigned channe
        return 1;
 err:
        close(powd->fd);
-       free(powd);
+       powd->fd = -1;
        return ret;
 }