Andre Noll [Sat, 8 Jul 2017 16:36:03 +0000 (18:36 +0200)]
build: Fix check for lopsub.
If the lopsub library is not installed, HAVE_LOPSUB should be set to
"no". The current code in configure.ac gets this wrong, causing the
configure script to succeed even if the library is not installed.
Andre Noll [Fri, 14 Jul 2017 12:50:43 +0000 (14:50 +0200)]
Merge branch 'refs/heads/t/manual'
A couple of patches which merge the contents of the overview.pdf file
into the user manual. After this, the documentation no longer depends
on dia.
Cooking for six weeks.
* refs/heads/t/manual:
manual: Expand description of para_play.
manual: Omit level 3 headers from table of contents.
manual: Combine overview.pdf and the user manual.
manual: Remove text about permissions of /var/paraslash.
manual: Correct format of para_client help output.
manual: Add lopsub installation instructions to quick start.
Andre Noll [Thu, 13 Jul 2017 15:21:13 +0000 (17:21 +0200)]
Merge branch 'maint'
A single important fix for the error subsystem. The merge conflicted
because master removed the E_AAC_AFH_INIT error code while maint
still has it. The conflict was trivial to resolve.
* refs/heads/maint:
Let error codes start out at index 1.
Andre Noll [Sat, 8 Jul 2017 20:55:11 +0000 (22:55 +0200)]
Let error codes start out at index 1.
When the error code facility was simplified one year ago in commit a775408 (Simplify the error subsystem, get rid of error2.[ch]) we
introduced a simple enum for all error codes, but missed the fact
that this approach assigns the first error code the value zero.
Hence, when the AAC decoder returns this error code, it will not be
recognized as an error because we generally check for negative return
values only.
This patch introduces an unused dummy error code so that the real
error codes start at index 1.
Andre Noll [Sun, 11 Jun 2017 10:13:22 +0000 (12:13 +0200)]
net.c: Silence clang warning.
clang-3.8.0 on FreeBSD complains about a recent change to net.c:
net.c:606:33: warning: missing field 'ss_family' initializer [-Wmissing-field-initializers]
struct sockaddr_storage ss = {0};
^
This line was introduced in commit 63128eea (net: Always initialize
struct sockaddr_storage) to avoid a warning from the static analyzer
of clang. Setting .ss_family initializes all struct members, which
makes both the analyzer and the compiler happy again.
Andre Noll [Tue, 13 Jun 2017 20:33:26 +0000 (22:33 +0200)]
filter: Handle bad filter numbers gracefully.
This modifies filter_get() to return NULL if an invalid filter number
is given, rather than aborting the process. This way applications
can loop over all filters without having to include filter_cmd.lsg.h.
filter_name(), which also receives a filter number, has no such
sanity check and could possibly access uninitialized memory if an
invalid argument was passed. This commit adds the check and makes the
function return NULL in this case, just like filter_get(). Moreover,
the function lacked documentation, so let's add it now.
Andre Noll [Tue, 13 Jun 2017 20:09:01 +0000 (22:09 +0200)]
audiod: Fix off-by-one bug in init_default_filters().
Filter numbers are one-based because zero is the number of the
(non-existing) supercommand of the filter_cmd suite. The loop in
init_default_filters() gets this wrong.
This bites only if no filter is given for at least one audio format.
Fortunately, the bug was easy to find because it triggers an assertion
in filter_get() which checks that the given number is at least one.
Andre Noll [Tue, 16 May 2017 20:21:12 +0000 (22:21 +0200)]
recv_common.c: Fix doxygen warning in recv_init().
In the doxygen comment of this function, one argument name was prefixed
with a backslash by mistake. Old doxygen versions did not complain
about this, but doxygen-1.8.11 does:
warning: unexpected token in comment block while parsing the argument of command param
Andre Noll [Mon, 1 May 2017 16:28:52 +0000 (18:28 +0200)]
manual: Expand description of para_play.
The text did not contain any characteristic features. Let's at least
mention that all audio formats are supported and that the command
line interface was designed to not suck.
Andre Noll [Sat, 29 Apr 2017 19:51:49 +0000 (21:51 +0200)]
manual: Omit level 3 headers from table of contents.
The table of contents was rather large because it contained too much
detail. This commit converts all level 3 headings to inline html which
has no visible effect except that the headings no longer appear in
the table of contents.
Andre Noll [Sat, 29 Apr 2017 02:33:17 +0000 (04:33 +0200)]
manual: Combine overview.pdf and the user manual.
The figures of the overview.pdf file look rather odd although they
used to look better when they were created four years ago. Apparently,
the dia command line tool which creates the pdf from the .dia source
file has changed and now messes up the lines which connect the parts
of the figure.
This commit re-implements four out of the five figures of the overview
file as ascii art in manual.md, removes overview.dia, and modifies
the documentation web page to no longer refer to the dia version.
The text of the overview file has been merged with the manual and
got improved a bit.
Andre Noll [Tue, 16 May 2017 20:08:19 +0000 (22:08 +0200)]
doxygen: Avoid segfault.
After an upgrade to Ubuntu-16.04, the new doxygen version 1.8.11
started to segfault. It turned out that this can be circumvented
by disabling USE_HTAGS so that doxygen will use its built-in source
browser instead of the htags tool of GNU global.
However, the html which is generated by the built-in source browser
the source code is unreadable because leading tab characters are not
shown, so indentation is messed up.
This patch deactivates the source browser for now, getting rid of
all source code in the generated output.
Andre Noll [Sat, 6 May 2017 15:40:38 +0000 (17:40 +0200)]
client: Silence a gcc-7.1,0 warning.
This version of gcc complains because a case statement in
client_pre_select() may fall through. The fallthrough is intentional,
however, and this is annotated with a comment. gcc-7 scans the comments
in a switch statement and suppresses the warning if it recognizes
a comment which says that fallthrough is intended. But for this to
happen, we must spell it correctly, and without whitespace.
After this commit, gcc-7 compiles the tree with no warnings.
Andre Noll [Sat, 29 Apr 2017 14:54:03 +0000 (16:54 +0200)]
Remove unused error code MPI_PRINT.
This had been removed already in commit eab41e87 (gcrypt: Remove
open-coded OAEP padding) but it was brought back by mistake in commit 9264932e (Merge branch 'refs/heads/t/dynamic_chunks').
Andre Noll [Thu, 27 Apr 2017 18:39:32 +0000 (20:39 +0200)]
Merge branch 'refs/heads/t/lopsub'
The bulk of the changes in this release is the conversion of all
command line parsers from gengetopt to lopsub.
The series also contains a few cleanups that have become possible
due to the switch from gengetopt to lopsub.
The patches towards the end of the series rename para_fade to
para_mixer.
Naturally, the merge conflicted rather heavily against the other
topic branches that have been merged since the lopsub branch was
started. Conflicting files:
The resolutions for these conflicts were recorded with git rerere
and have been tested for quite some time.
Cooking for three weeks.
* refs/heads/t/lopsub: (74 commits)
audioc: Avoid double free in audioc_i9e_line_handler().
audiod: Avoid uninitialized memory access.
Simplify mixer setup.
mixer: Implement non-linear time scale for fading.
mixer: Allow arbitrary relative time for sleep subcommand.
Convert para_fade to subcommands, rename it to para_mixer.
build: Create .dep files only during compilation.
build: Simplify definition of $m4_lls_deps.
build: Rename command list variables.
build: Combine $(CFLAGS) and $(STRICT_CFLAGS).
build: Let .d files depend only on .c.
build: Don't create phony targets for dependencies.
build: Remove duplicate dependency.
build: Remove cmdline_dir and friends.
build: Remove some unused variables from Makefile.real.
build: Remove m4/gengetopt.
Remove gengetopt and help2man checks from configure.ac.
Remove man_util.bash.
Remove ggo.c and ggo.h.
manual: Do not mention gengetopt and help2man any more.
...
Andre Noll [Fri, 21 Apr 2017 18:30:12 +0000 (20:30 +0200)]
vss: Add an assertion for vsst->header_buf.
if vsst->header_len > 0 but vsst->header_buf is NULL, something weird
is going on and non-obvious bad things will happen later. The assertion
makes sure we notice early that there is a problem. It also silences a
scan-build warning.
Andre Noll [Tue, 25 Apr 2017 16:04:57 +0000 (18:04 +0200)]
Merge branch 'maint'
A couple of fixes found by the clang static analyzer.
* maint:
aft: Check return value of load_afsi().
audiod: Avoid reading garbage in get_time_string().
net: Always initialize struct sockaddr_storage.
wma_afh: Fix two bugs in convert_utf8_to_utf16().
Andre Noll [Mon, 24 Apr 2017 18:05:18 +0000 (20:05 +0200)]
Merge branch 'refs/heads/t/xz'
A single patch which modifies the build system to create xz-compressed
tarballs. The patch conflicted against the changes introduced by the
recently merged makefile_conventions topic branch.
Cooking for almost a month.
* refs/heads/t/xz:
Switch to xz to compress tarballs.
Andre Noll [Sun, 23 Apr 2017 19:12:22 +0000 (21:12 +0200)]
Merge branch 'refs/heads/t/dynamic_chunks'
A rather long and intrusive series that finally improves the aac
decoder and audio format handler.
The merge had a minor conflict in error.h, which was easily resolved
by removing both affected error codes.
Cooking for a month.
* refs/heads/t/dynamic_chunks: (24 commits)
afh_recv: Check return value of afh_get_chunk().
aacdec: Decode only one frame per iteration.
aacdec: Combine aac_open() and aacdec_open().
aacdec: Make "initialized" a boolean.
aacdec: Make frame_info local to ->post_select().
aacdec: Remove pointless assignment.
aacdec: Remove pointless check and improve comment.
aacdec: Rename buffer variables.
aacdec: Remove pointless variable p.
aacdec: Remove check which is always true.
aacdec: Kill pointless label.
aacdec: Remove superfluous assignment.
aacdec: Improve and silence error message.
aacdec: Prefer NeAACDecInit() over NeAACDecInit2().
aacdec: Don't eat full buffer on errors.
Combine aacdec and aac_common.
Convert the aac audio format handler to libmp4ff.
aac_afh: Don't create chunk tables any more.
afh: Dynamic chunks.
server: Store max chunk size in database.
...
Andre Noll [Fri, 21 Apr 2017 18:57:38 +0000 (20:57 +0200)]
afh_recv: Check return value of afh_get_chunk().
Starting with commit b6b571e6c (afh: Dynamic chunks) the function
returns an int value and may fail. Although we store the return value
in a variable, the value of the variable is never read, causing the
clang static analyzer to complain (rightfully).
This patch modifies afh_recv_post_select() to fail if afh_get_chunk()
returns negative.
Andre Noll [Fri, 21 Apr 2017 20:54:36 +0000 (22:54 +0200)]
aft: Check return value of load_afsi().
This function should never fail, but it does return an error code and
all callers except copy_selector_info() check the return value. So
let's add the check there as well.
Andre Noll [Fri, 21 Apr 2017 18:43:06 +0000 (20:43 +0200)]
audiod: Avoid uninitialized memory access.
In handle_connect(), the local pointer variable errctx is not
initialized. If an error occurs early in the function, for example
because recv_cred_buffer() fails, we jump to the "out" label and try
to print the string errctx points to. This will cause a segfault or
worse, so make sure the variable is always initialized.
This bug was found by the static analyzer of clang.
Andre Noll [Wed, 19 Apr 2017 17:13:20 +0000 (19:13 +0200)]
Merge branch 'refs/heads/t/makefile_conventions'
A bunch of changes which strive to make the paraslash build system
more standard.
Cooking for three months.
* refs/heads/t/makefile_conventions:
build: Add target "check" as a synonym for "test".
build: Rename target "tarball" to "dist".
build: Do not strip installed executables by default.
build: Support $(DESTDIR).
build: Rename clean targets.
Andre Noll [Sun, 16 Apr 2017 18:15:35 +0000 (20:15 +0200)]
Merge branch 'refs/heads/t/rm_rc4'
This patch removes support for RC4, making the AES-based stream
cipher mandadory. The aes_ctr128 server feature is made a no-op,
breaking support with very old clients (<= 0.5.1).
Andre Noll [Sun, 9 Apr 2017 11:47:15 +0000 (13:47 +0200)]
Merge branch 'refs/heads/t/rm_asn'
A few cleanups, and one patch which removes an obsolete feature,
getting rid of an open-coded ASN parser.
Cooking for three months.
* refs/heads/t/rm_asn:
Remove unused E_PUBLIC_KEY.
crypt.c: Combine load_key() and get_private_key().
crypto: Remove support for ASN public keys.
crypto: Simplify asymetric key handling.
crypto: Rename check_key_file() -> check_private_key_file().
gcrypt.c: Always initialize result pointer in get_private_key().
Andre Noll [Fri, 30 Dec 2016 23:06:10 +0000 (00:06 +0100)]
Simplify mixer setup.
The ->init method of the two mixer implementations initialize the
members of the mixer structure. This structure contains only function
pointers. Their values, once set, never change.
Hence we may initialize the structure at compile time and make it
constant.
Andre Noll [Fri, 30 Dec 2016 22:25:11 +0000 (23:25 +0100)]
mixer: Implement non-linear time scale for fading.
For some sound hardware, changing the volume channel has little
effect for small values but even an increment by one is audible for
high values. For such hardware it is desirable to scale the volume
in a non-linear way.
This patch implements this feature. The new --fade-exponent receives
an argument to control the level of non-linearity. The default value
of zero results in old behavior: linear scaling.
For the implementation we need to compute (the inverse of) t ->
t^alpha, where alpha is between zero and one. This requires the use
of exp(3) and log(3), so we need to include <math.h> and link with -lm.
Andre Noll [Sun, 3 Jul 2016 14:47:13 +0000 (16:47 +0200)]
Switch to xz to compress tarballs.
xz compresses better than bzip2, and decompression needs less time. It
is also widely used by many other software projects, so there should
be no disadvantage.
We keep removing the .bz2 tarball on make clean, and also keep the
paraslash-*.tar.bz2 entry in .gitignore for the time being.
Andre Noll [Tue, 27 Dec 2016 23:53:29 +0000 (00:53 +0100)]
mixer: Allow arbitrary relative time for sleep subcommand.
If --wake-hour is not given, the wake time defaults to now + nine
hours. This is arbitrary, and the constant 9 was hardcoded with no
way to specify it at the command line or in the config file.
This commit replaces --wake-hour and --wake-min by --wake-time whose
argument must be given in HH:MM syntax. An optional leading '+'
character allows to specify a relative offset.
Andre Noll [Tue, 27 Dec 2016 21:19:03 +0000 (22:19 +0100)]
Convert para_fade to subcommands, rename it to para_mixer.
para_fade operates in one of several modes, but the command line
options are shared. So most of the options are ignored for any
particular mode. With lopsub we can do better and define one
subcommand per mode so that options which are only relevant to one
subcommand can be made local to that subcommand.
With subcommands the syntax of the command changes, which breaks
existing scripts. So it seems to be prudent to rename the executable
from para_fade to para_mixer. The old name was a bit misleading anyway
since the command can do much more than just fade the volume.
Andre Noll [Sat, 21 Jan 2017 15:18:44 +0000 (16:18 +0100)]
build: Create .dep files only during compilation.
It is unnecessary to run a dedicated command to create the dependency
files because:
* If the object file does not exist, we have to run the compiler
anyway, which creates the dependency on the fly.
* If the object file exists, the dependency file also exists, so
the build system notices if the object file needs to be rebuilt,
for example because an included header file was modified.
The only thing we must guarantee is that all included header files
exist. We do this by introducing an order-only dependency: all object
files depend on all .lsg.h files but we impose this specific ordering
without forcing the targets to be updated.
This speeds up the build a lot and also simplifies Makefile.real.
Andre Noll [Sun, 17 Jul 2016 18:54:00 +0000 (20:54 +0200)]
build: Rename command list variables.
The old names, xxx_command_lists and man_util_command_lists are not
accurate any more, and unnecessarily clumsy to boot.
This patch renames the variables to xxx_commands and all_commands and
sorts the three affected sections of the Makefile alphabetically to
reduce the risk of future merge conflicts.
Andre Noll [Sun, 17 Jul 2016 16:27:13 +0000 (18:27 +0200)]
build: Combine $(CFLAGS) and $(STRICT_CFLAGS).
We used to compile the parsers generated by gengetopt with less strict
flags to avoid warnings in generated files. With lopsub this is no
longer necessary, so one set of flags suffices.
Moreover, we currently initialize $(STRICT_CFLAGS) to $(CFLAGS) (from
the environment), then append our own flags. This is unfortunate
because the user defined settings in $(CFLAGS) are overwritten.
This patch changes the Makefile to only set STRICT_CFLAGS. We now
pass $(STRICT_CFLAGS) $(CFLAGS) to the compiler, allowing the user
to override (parts of) $(STRICT_CFLAGS) by adding -Wno-foo to CFLAGS.
We use the opportunity to regroup the various options a little.
Andre Noll [Sat, 16 Jul 2016 20:24:12 +0000 (22:24 +0200)]
build: Let .d files depend only on .c.
Currently we let each .d file depend on the same set of files as the
.o file by having two targets specified as arguments to -MT options
in the cc command that creates the .d file: one for the .d file and
one for the .o file.
This approach runs into problems if header files are removed and the
now stale .d file depends on a file which no longer exists.
It is enough to let the .d file depend only on the corresponding
.c file. In case an included file changes or is removed, the .c
file changes as well, so we already know we must build the object
file and can update the .d file at the same time, without running
cc twice. The -MMD option which is added to the usual cc command
instructs the compiler to create both the .d and the .o file in one go.
When creating the .o and .d files simultaneously, we don't need a
sed command to prepend the directory containing the .lsg.h headers
as these files are prerequisites of the object file being created,
so they are known to exist when the cc command is executed.
Andre Noll [Sat, 16 Jul 2016 11:43:52 +0000 (13:43 +0200)]
build: Don't create phony targets for dependencies.
The -MP option is supposed to work around make errors after a header
file was removed. However, with the option enabled, the attempt to
include a non-existing header file causes the build to loop endlessly.
Andre Noll [Sun, 10 Jul 2016 16:33:48 +0000 (18:33 +0200)]
build: Remove cmdline_dir and friends.
This directory used to contain the source files of the command line
parsers generated by gengetopt. There are no such files any more,
so the the receipts which compile these source files can go away and
we do not need to create the directory any more.
The special CFLAGS for compiling those files can be removed as well
as the include directive for CPPFLAGS.
Finally, the make construct which filters out the .cmdline.d files
from the list of dependency files is no longer needed, and we may get
rid of the sed command which prepends $(cmdline_dir) to the includes
of the dependency files.
Andre Noll [Wed, 29 Jun 2016 20:21:35 +0000 (22:21 +0200)]
build: Remove some unused variables from Makefile.real.
All executables are converted, so $converted_executables is the same
as $executables, modulo executables which can not be built (and are
thus irrelevant). Similarly, $unconverted_executables is empty and
can be removed as well.
The $m4_deps variable was only used for the gengetopt files, so this
can also be removed, along with $ggo_dir.
$help2man_dir used to contain the path to the directory for the output
files of help2man. Since we now generate the man pages with lopsubgen,
$help2man_dir has become unused and can be removed.
Andre Noll [Sun, 26 Jun 2016 10:40:20 +0000 (12:40 +0200)]
build: Remove m4/gengetopt.
This directory only contained a single file: the makefile for
generating the command line parsers with gengetopt. Since we no longer
rely on gengetopt, we may remove $(m4_ggo_dir), m4/gengetopt/makefile
and the corresponding include directive in Makefile.real.
Andre Noll [Sun, 26 Jun 2016 10:44:56 +0000 (12:44 +0200)]
manual: Do not mention gengetopt and help2man any more.
Both tools are no longer required to build the paraslash tree, so
there is no point to list them in the set of packages to install. The
patch also removes the links to the source code from the user manual.
Andre Noll [Fri, 24 Jun 2016 19:38:24 +0000 (21:38 +0200)]
Convert para_server to lopsub.
This is the last executable to be converted to lopsub.
acl_init() is removed from acl.c, and the initialization of the access
control list is moved to init_sender_status() of send_common.c. It
now takes an lls_opt_result argument and calls acl_add_entry() for
each argument given. The latter function needs to be made public.
In dccp_send.c we check the FEC parameters and change the gengetopt
config structure to contain the default values if invalid FEC
parameters were given. With lopsub this is no longer possible as
the lls_parse_result structure is opaque. We copy the FEC parameters
to a dccp_fec_client structure anyway, so is it easiest to move the
check there.
The patch removes the unused gengetopt option files but leaves the
gengetopt infrastructure of the build system in place. The build
system will be cleaned up in subsequent patches.
Andre Noll [Sat, 27 Aug 2016 13:05:13 +0000 (15:05 +0200)]
Convert para_audiod to lopsub.
This commit replaces the gengetopt file for para_audiod by a lopsub
suite, introducing several new files in m/lls/include which correspond
to options also needed by para_server (which has not been converted
to lopsub yet).
The audiod_status_info enumeration is now provided by lopsub and can
be removed from audiod.h.
The patch also adds a new description section to the manual page
para_audiod(1).
Andre Noll [Sat, 18 Jun 2016 14:57:39 +0000 (16:57 +0200)]
Convert para_gui to lopsub.
This replaces the gengetopt file for para_gui by a lopsub suite and
links para_gui with -llopsub.
The new FOR_EACH_KEY_MAP() macro is introduced for iterating over
all key bindings given at the command line or in the config file.
The bulk of the change is parse_config_file_or_die() where we get rid
of the gengetopt specific hack which removed all key bindings due to
gengetopt appending the options when the config parser is called a
second time.
The patch also adds a description section to the man page of para_gui.
Andre Noll [Sun, 25 May 2014 22:02:40 +0000 (00:02 +0200)]
gui: Remove --timeout.
para_gui should work well regardless of the scheduler timeout setting.
This commit removes the timeout options and changes gui.c to use a
fixed timeout of one second.
Andre Noll [Sun, 12 Jun 2016 18:46:10 +0000 (20:46 +0200)]
Convert para_filter to lopsub.
Changes the semantics in case --filter is not given. We used to
print an error, but it makes more sense to show the list of supported
filters in this case.
If no filters are given, we now print the list of available filters. A
new function in filter_common.c, print_filter_list(), is introduced
for this purpose.
The manual page of para_filter has been extended to include an overall
description of the command.
The only error code of filter.c, E_NO_FILTERS, becomes unused and is
removed.
Andre Noll [Fri, 26 Aug 2016 18:12:01 +0000 (20:12 +0200)]
Convert para_write to lopsub.
This replaces the gengetopt file write.m4 by write.suite.m4, making use
of the shared macros in m4/lls/include for --channels, --sample-format
and --sample-rate.
The gengetopt files for these options are not needed for the unconverted
executables which still rely on gengetopt, so they can be removed.
In write.c we now use LLS_COPY_WAV_PARMS() rather than
COPY_WAV_PARMS(). The latter macro becomes unused and is removed
as well.
Andre Noll [Fri, 26 Aug 2016 13:28:24 +0000 (15:28 +0200)]
Convert para_recv to lopsub.
This converts the gengetopt parser for para_recv to lopsub format,
replacing the ggo file by a lopsub suite.
The conversion is rather simple because para_recv does not have
a config file parser and because changes to the build system are
small because we already link para_recv with -llopsub due to the
recv_cmd suite.
Andre Noll [Sun, 10 Apr 2016 20:50:17 +0000 (22:50 +0200)]
Convert writers to lopsub.
Similar to the previous commits for receivers and filters, this
commit replaces the five gengetopt parsers for the alsa, ao, file,
oss, osx writers by a lopsub suite and links para_write with -llopsub.
This allows to get rid of the WRITER_ENUM and the writers array as a
reference to each writer structure are stored in the lopsub user_data
pointer. Moreover, ->init(), ->parse_config(), ->free_config()
and ->ggo_help() of struct writer are not needed any more and can
be removed.
The patch also removes write_common.h and moves the few prototypes
write.h.
Now that receivers, filters and writers have all been converted, we
may also stop to include ggo.h from audiod_command.c and play.c.
As for the receivers and filters, t0005 needs slight adjustments due
to the new section header in the man page.
Andre Noll [Sun, 10 Apr 2016 20:44:30 +0000 (22:44 +0200)]
Convert filters to lopsub.
This replaces the *_filter.m4 gengetopt files by the filter_cmd
lopsub suite, where each filter is realized as a subcommand. Due to
this change, para_filter needs to be linked with -llopsub.
The filter structure is now stored in the user_data pointer provided
by lopsub, allowing to get rid of the global filters[] array, the
FILTER_ENUM macro and the corresponding enumeration constants.
The removal of the ->goo_help member of struct filter makes this
structure constant. Hence ->init() of struct filter can also go
away. We still can tell whether a filter is supported by checking
the user_data pointer: if it is NULL, the filter is unsupported. The
new filter_supported() helper in filter_common.c is provided for
convenience.
Parsing of the filter command line options is now performed
generically, and the ->parse_config() method is renamed to ->setup(),
an optional function which is supposed to perform semantic checks
and the one-time setup of the filter, if any. It is accompanied by
->teardown() which replaces ->free_config().
The conversion of the individual filters is easy since most filters
have a simple syntax or take no arguments at all. The resample_filter,
however, needs a different way to copy the wav parameters from the
lopsub parse result to the wav parms structure. A suitable macro,
LLS_COPY_WAV_PARMS is added to check_wav.h for this purpose. The old
COPY_WAV_PARMS needs to stay until para_write, the only other user
of the macro, has been converted as well.
The section heading of the manual page has changed slightly, causing
t0005 to fail. Hence this test needs a slight adjustment.
Andre Noll [Tue, 23 Aug 2016 10:04:19 +0000 (12:04 +0200)]
Convert para_play to lopsub.
This changes para_play to use the lopsub library rather than gengetopt
for parsing the command line and the config file.
The old approach of permuting argv[] no longer works with lopsub
because direct access to the array of non-option arguments is no
longer possible. Therefore we introduce shuffle_map[], an array of
indices which defaults to 1..n if --randomize is not given, and a
random permutation of 1..n otherwise. The new get_playlist_file()
helper returns the path to the input file determined by permuting
the given index.
The overall description for the manual page has also been improved
slightly.
Since m4/gengetopt/history_file.m4 has become unused, this file can
be removed.
Andre Noll [Sun, 10 Apr 2016 20:31:11 +0000 (22:31 +0200)]
Convert para_fade to lopsub.
This replaces the ggo file for the command line and config file parser
of para_fade by a lopsub suite file and links para_fade against the
lopsub library.
As there are no subcommands, the conversion is straight forward and
the bulk of the patch are simple changes which replace access to the
gengetopt structure by equivalent lopsub constructs.
Andre Noll [Sun, 10 Apr 2016 20:29:29 +0000 (22:29 +0200)]
Convert para_client to lopsub.
This replaces the gengetopt command line parser for para_client by a
lopsub suite and links para_client against the lopsub library. The ggo
file for para_client was the last user of m4/gengetopt/complete.m4,
so this file can be removed.
The tricky part is create_merged_lpr(), which replaces
make_client_argv(). It is called from the i9e line handler and from
the completers. The new function merges the original parse result
with the arguments given at the command line to produce the parse
result stored in the client task structure.
The completers no longer duplicate the possible options each server
subcommand because the header file generated by lopsubgen exposes
an array of string literals which is suitable as the opts argument
of i9e_complete_option().
Andre Noll [Mon, 22 Aug 2016 13:13:40 +0000 (15:13 +0200)]
Convert receivers to lopsub.
This converts the four receivers (afh, http, dccp, udp) to use the
lopsub library instead of gengetopt.
The command line options of the receivers are implemented as
subcommands of the new recv_cmd lopsub suite. Hence the four gengetopt
command line parsers and ->ggo_help of struct receiver can be removed.
This change allows to get rid of the receiver array which was defined
through the DEFINE_RECEIVER_ARRAY macro. We now store each receiver
structure in the user_data pointer provided by lopsub.
Since this structure is initialized at compile time (and constant since
->ggo_help is gone), ->init() of struct receiver is no longer needed to
initialize the various function pointers. The function is now optional
and does not take an argument any more. At the moment, only the afh
receiver needs ->init() to initialize all supported audio format handlers.
t0005 needs slight adjustment since the section headers of the help text
have changed a bit.
Andre Noll [Sun, 7 Aug 2016 22:01:19 +0000 (00:01 +0200)]
Convert audioc to lopsub.
This changes para_audioc to use the lopsub library rather than
gengetopt for parsing the command line options. The gengetopt input
file m4/gengetopt/audioc.m4 is replaced by an equivalent suite file,
audioc.c is adjusted to call the lopsub primitives instead if the
gengetopt parsers, and para_audioc is linked against lopsub. Moreover,
the manual page of audioc is now generated with lopsubgen.
Since this is the first executable which is converted, the commit
introduces a fair amount of infrastructure which will also be used
by other executables. Specifically:
* Common command line options (--help, --detailed-help, --version,
--loglevel, --history_file, --complete) are stored in per-option
files below m4/lls/include. Each of these files is included from
audioc.suite.m4. To tell make which files audioc.suite depends on,
we use the line synchronization feature of m4 and a simple awk script
to create a .m4d file which contains these dependencies, similar to
the .d files which describe dependencies of .c and .h files. The new
m4_lls_deps make variable contains the set of .m4d files.
* A generic copyright section for the man page which refers to the
COPYRIGHT_YEAR macro, defined from the make variable in Makefile.real.
* The new make variable LOGLEVELS. We need to know the set of loglevels
in the suite files as well as in the C code, so the variable avoids
to duplicate this information.
Andre Noll [Sat, 31 Dec 2016 19:07:33 +0000 (20:07 +0100)]
Remove *.cmd and command_util.bash.
The four *.cmd files are no longer needed and can be removed,
along with the script which transformed these files into C code. The
directory for the generated files, $(build_dir)/cmdlist, can go away
as well.
With command_util.bash gone, the Makefile can also be cleaned up
considerably. In particular, the ugly TOUPPER make function can be
removed because it was only used by the command_util recipe. Moreover,
The dependencies for the *.command_list.* files are no longer needed.
Finally, the sed command which fixed up the dependencies in the *.d
files can be simplified.
Andre Noll [Mon, 7 Sep 2015 21:40:58 +0000 (23:40 +0200)]
play: Remove support for non-lopsub commands.
This cleans up play.c to get rid of struct pp_command, the array of
command handlers and the compatibility code for non-lopsub commands
in run_command() and com_help().
Also the FOR_EACH_COMMAND() macro to iterate over all non-lopsub
commands can go away and we no longer need to include the
play.command_list.h header generated by command_util.bash.
Andre Noll [Mon, 28 Mar 2016 03:52:25 +0000 (03:52 +0000)]
play: Convert com_quit() to lopsub.
This converts the last subcommand of para_play. Cleanups are done in
subsequent patches although the declarations of the command handlers
are removed here because they have become unused and triggered
compiler warnings.
Andre Noll [Mon, 28 Mar 2016 03:47:07 +0000 (03:47 +0000)]
play: Convert com_ff() to lopsub.
Converting com_ff() is analogous to com_jmp() since both subcommands
take a single integer argument. See the commit message of the previous
commit which converted com_jmp() for more information.
Andre Noll [Mon, 28 Mar 2016 16:55:58 +0000 (16:55 +0000)]
play: Convert com_jmp() to lopsub.
The command handler needs to check that there is a single argument
which is an integer between 0 and 100. This check needs to be modified
to use the lopsub primitives rather than accessing the argument
vector directly.
Unfortunately we can not perform the conversion of the string argument
into an int value with lopsub since the given percentage is an unnamed
option rather than an argument of an option.
The patch also rewords the summary and the help text of the jmp
subcommand slightly to be more clear.
Andre Noll [Mon, 28 Mar 2016 16:55:42 +0000 (16:55 +0000)]
play: Convert com_bg() to lopsub.
There is not much to convert since the command takes no arguments,
and thus lpr is unused. The commit gets rid of the argc check which
is performed by lopsub and fixes a typo in the command summary:
s/input/insert.
Andre Noll [Mon, 7 Sep 2015 20:30:31 +0000 (22:30 +0200)]
play: Convert com_prev() to lopsub.
The arg count check can be removed from the command handler, and the
pointless help text of the commit has been removed because it said
more or less the same as the summary text.
Andre Noll [Mon, 28 Mar 2016 04:05:14 +0000 (04:05 +0000)]
play: Convert com_next() to lopsub.
com_next() is also called from com_jmp(), where we needed to pass
a fake argv. This is no longer necessary as com_next() now takes
a parse result pointer which is unused. So we may just pass NULL
from com_jmp().