From 88c5dc601a5d1b194da3102566a3fb97947a6aee Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Thu, 1 Dec 2011 19:25:47 +0100 Subject: [PATCH 1/1] audiod: Deprecate the --no_default_filters option. This option does not make much sense anymore these days as we have sane defaults in case no filter was given. We prefer deprecation over removal because this allows to switch between old and new versions without having to edit the config file. The option will be removed after the next release. --- audiod.c | 6 ++++-- ggo/audiod.m4 | 39 ++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/audiod.c b/audiod.c index a78757b6..d7765e21 100644 --- 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/ggo/audiod.m4 b/ggo/audiod.m4 index 1fe16959..1bc5db14 100644 --- 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' -- 2.39.2