Andre Noll [Sat, 17 Aug 2013 18:08:49 +0000 (20:08 +0200)]
Update README.
The README file mentions mp3, ogg/vorbis, aac and wma, but speex,
flac and ogg/opus were all missing. Do not even try to list the
supported audio formats, it always gets out of sync.
Secondly, since this file will not be processed by grutatxt, it's
pointless to format it according to the grutatxt syntax.
Finally, this change adds the URLs of the web page and the git
repository, as well as my email address.
Andre Noll [Sat, 17 Aug 2013 11:57:32 +0000 (13:57 +0200)]
Merge branch 't/remove_sb_compat'
This topic branch was cooking for over 4 months and should now be
ready for prime time. The patches break compatibility with earlier
versions, so we need to bump the version number real soon now.
72ffa7 client: Only start stdin task for addblob commands.
85a6ae Remove old stream cipher API.
d1407f Allow addblob commands to create output.
243e31 client: Remove client_recv_buffer().
277ed4 client: Remove sb-compatibility code.
36ba18 Reject non-sideband connections.
6ca50b blob: Avoid zero sized memcpy().
cf308c Fix typo in documentation of stdin_command().
fdb9d2 blob: Simplify fd2buf().
Andre Noll [Mon, 29 Jul 2013 22:44:37 +0000 (00:44 +0200)]
server/gcrypt: Fix sending the empty status items.
When para_server enters the "stopped" state, it needs to inform all
clients which are executing the stat command that no audio file is
currently available.
To this aim the stat command handler calls empty_status_items(), which
creates a buffer containing empty values for most status items. This
function tries to be smart by computing the buffer only once. It
saves a reference in a static variable so that on subsequent calls
it can simply return the same buffer.
This works fine when para_server is compiled against the openssl
crypto library. However, it fails when libgcrypt is used because with
libgcrypt the send buffer is encrypted in-place. Hence on subsequent
calls the already encrypted buffer will be encrypted again, resulting
in garbage being sent to the client.
This patch avoids this bug by using a fresh buffer each time the
empty status items are sent.
Andre Noll [Sun, 21 Jul 2013 14:30:23 +0000 (16:30 +0200)]
sched.h: Remove outdated comment.
The term "these functions" is undefined here, and setting t->error
is deprecated. The post_select() functions are supposed to return
an error code instead, but this is already mentioned further down in
the file, so let's just remove the comment.
Andre Noll [Sat, 6 Jul 2013 18:23:04 +0000 (20:23 +0200)]
ggo.c: Document return value of printf_or_die().
Commit b59a3c41 (filter: Wrap lines in the available filter list)
changed the return value of this function from void to int but missed
to update the documentation.
Andre Noll [Sat, 6 Jul 2013 21:00:14 +0000 (23:00 +0200)]
audiod: Close filters in reverse order.
Otherwise, a subsequent filter might refer to a buffer reference of
the previous filter, accessing freed memory. This is not a bug right
now, as audiod only closes filters after the full buffer tree has
become inactive, i.e. after all buffer tree nodes have unregistered
their task. It's cleaner to reverse the loop though, and it has no
additional cost.
Andre Noll [Fri, 12 Jul 2013 14:08:41 +0000 (16:08 +0200)]
opusdec: avoid __STDC_VERSION__ warning.
opusdec_filter.c indirectly includes opus_types.h which checks whether
__STDC_VERSION__ >= 199901L. However, at least some gcc versions
don't define __STDC_VERSION__ which results in
warning: "__STDC_VERSION__" is not defined
For example, this happens on Ubuntu lucid, which ships gcc-4.4.3.
This patch gets rid of the warning by defining __STDC_VERSION__
if necessary prior to including the opus_types header.
Andre Noll [Sun, 7 Jul 2013 11:22:48 +0000 (13:22 +0200)]
afh: Initialize audio format handlers only once.
afc.c calls afh_init() twice. This does not really hurt as this
function is idempotent, but it causes the initialization log messages
to be printed twice.
This gets rid of the additional call to afh_init() which crept in
in commit 042767ce (Use self-made help to avoid recompilations on
version changes).
Andre Noll [Mon, 1 Jul 2013 19:06:48 +0000 (21:06 +0200)]
Merge branch 't/versioning_improvements'
Cooking for ~2 weeks.
15e99a version.c: Mark version_git() as const.
9bdebf Remove CODENAME macro.
be2f6b gui: Use version_single_line().
d60dae Improve man page layout.
5dbc9a afh/play: Include supported audio formats in help output.
042767 Use self-made help to avoid recompilations on version changes.
48f1fc Provide "purpose" texts.
aa74a9 Revamp ggo help.
9f7a49 afh_recv: Replace ggo text section by description.
b59e0e Make gengetopt descriptions work.
06b3e7 Introduce version.c to limit recompilation on version changes.
75feac Make all commands print git version and improve version string.
b01605 Avoid unwanted log messages during startup.
625fdb Don't check return value of command line parsers unnecessarily.
533b03 Build receivers, filters and writers without -h and -V support.
b59a3c filter: Wrap lines in the available filter list.
9e56d3 audioc: Print config file errors.
e5264d doc: Rewrite udp sender description
5ec373 client: Fix typo in comment.
6d5159 client: Remove duplicate include.
This is because O_NONBLOCK is a file status flag rather than a file
descriptor flag, i.e. nonblocking mode is a property of the file
description rather than the file descriptor.
In the above command both stdin of the para_client process and
stdout of the grep process refer to the same file description (the
terminal). para_client sets stdin to nonblocking mode, hence stdout
of the grep process is also in nonblocking mode.
We avoid this problem by changing client.c to only set stdin to
nonblocking mode if we actually need to read from stdin, i.e. only
for the addblob commands. This is achieved by registering the stdin
task (which sets the O_NONBLOCK flag) only if the client status
is CL_SENDING.
For addblob commands the client status changes from CL_EXECUTING to
CL_SENDING, so we can not simply terminate the supervisor task any more
after the stdout task has been registered. Instead we must keep this
task alive and (a) remember that stdout has already been started, and
(b) start the stdin task in case the client status becomes CL_SENDING.
Unfortunately, there is no simple way to store this bit of information
as we don't have a dedicated supervisor structure yet. Therefore this
patch introduces this structure as a task struct plus a single boolean.
Andre Noll [Sat, 22 Jun 2013 15:20:15 +0000 (17:20 +0200)]
i9e: Fix memory leak in clear_bottom_line().
In clear_bottom_line() we call readline's rl_copy_text() which
allocates a buffer for the given range of the current input line. But
we never free this buffer, which results in a memory leak. This patch
plugs the leak.
Andre Noll [Sat, 22 Jun 2013 14:59:04 +0000 (16:59 +0200)]
Handle empty command lines properly.
Both para_client and para_audioc create an argument vector from the
given command line using create_argv(). If the command line contains
only whitespace characters, this vector has length zero, and argv[0]
is NULL.
We missed to check for this at at least three places in audioc.c,
client.c and audiod_command.c, which resulted in crashes due to NULL
pointer dereferences or failed assertions.
These bugs can easily be triggered by starting para_client or
para_audioc in interactive mode, entering a single space character
and hitting return.
This patch adds the missing checks to prevent the crashes.
Andre Noll [Sun, 16 Jun 2013 12:22:06 +0000 (14:22 +0200)]
gui: Fix off-by-one in add_spaces().
Commit e90c6c0a (Speed up add_spaces().) changed add_spaces() to print
space characters in chunks rather than one at a time. It introduced
space[], an array of whitespace characters, which is written entirely
if there are more spaces to print than the size of the array. However,
in the calculation of how much was printed so far, we missed the fact
that sizeof(space) includes the terminating NULL byte, so this number
is in fact the number of space characters *plus one*.
Consequently, we printed too few space characters. This resulted in
parts of the previous string still being visible in the top window
of para_gui.
Andre Noll [Sun, 7 Apr 2013 02:31:51 +0000 (02:31 +0000)]
Provide "purpose" texts.
This text will be printed right after the program name in the --help
output. For para_afh, the inline text becomes redundant, so this text
is removed.
Each executable gets a purpose text, and for receivers, filters,
writers the purpose will be printed as part of the help output of
para_audiod, para_filter. para_recv and para_write.
Andre Noll [Fri, 12 Apr 2013 11:54:37 +0000 (13:54 +0200)]
Revamp ggo help.
This adds usage and description fields to struct ggo_help and
changes ggo_print_help() to optionally print these.
The boolean detailed_help flag of ggo_print_help() is replaced by a
bitmask which lets the caller specify what to print. Four pre-defined
masks are used to print the normal help, the detailed help, the help
for modules (receivers, filters, writers) and the detailed module help.
The new macro DEFINE_GGO_HELP can be employed to create a struct
ggo_help from a gengetopt structure.
Andre Noll [Fri, 12 Apr 2013 11:54:12 +0000 (13:54 +0200)]
Make gengetopt descriptions work.
With gengetopt's text and description options it is not possible to
print a text only when --detailed-help was given, but not when only
--help is given.
Moreover, headers generated with old versions of gengetopt do not
export the description text. However, declaring it unconditionally
causes compiler warnings on new systems.
To circumvent these problems, we introduce a new test for configure
which checks whether the description string is declared. If it is not,
we simply append the declaration to the *.cmdline.h files.
This change allows to move the description string of para_play to
the gengetopt source file.
Andre Noll [Fri, 12 Apr 2013 12:23:45 +0000 (14:23 +0200)]
Introduce version.c to limit recompilation on version changes.
Currently version.h includes git-version.h which changes whenever
a different commit is checked out or the working tree becomes dirty
because a file has been modified. Consequently, all .c files that
include this header must be recompiled in this case.
To limit the number of recompilations, this commit introduces
version.c, which contains functions that return the various types of
the version string. It is now the only file that includes version.h,
so only version.o must be rebuilt if git-version.h changes.
This also adds the build date, OS and CC version to the version output.
This difference comes from the fact that para_afh has its own
->print_help method which uses the VERSION_SINGLE_LINE macro of
version.h while para_audioc relies on gengetopt's help output.
The latter uses the make variable PACKAGE_VERSION which gets
initialized at configure time through the second argument in AC_INIT
of configure.ac. This value is either the version number for or the
string "git".
It's a good thing to have the abbreviated git version encoded in
all executables, so this commit changes the argument of gengetopt's
--set-version to the git version string including the codename. With
the patch applied, the output of all commands looks like this if
--version was given:
para_filter 0.4.12.12.g11d7 (spectral gravity)
To make sure things stay consistent, the patch introduces the
VERSION_SINGLE_LINE macro and changes all commands to use it instead
of open coding the version string.
That's because recv_init() is called before the command line arguments
are parsed, so the loglevel has not been set at this point. Other
programs have similar problems.
Fix these problems by always setting the loglevel right after a parser
has been called so that the init functions run *after* loglevel has
been set.
Andre Noll [Sat, 6 Apr 2013 18:59:12 +0000 (18:59 +0000)]
Don't check return value of command line parsers unnecessarily.
All gengetopt parsers except the one for para_client are generated
without the --no-handle-error option, i.e. these parsers exit on errors.
Hence it is pointless to check return values.
Andre Noll [Tue, 2 Apr 2013 14:30:06 +0000 (14:30 +0000)]
Simplify i9e_line_handler.
The line handlers of all three users of the i9e API (play, client
and audioc) return immediately if the passed line is NULL or the
empty string. Hence we may call the line handler only if there is a
non-empty line to dispatch.
Moving the check for a non-empty line to generic i9e code simplifies
the three line handlers a bit and avoids code duplication.
Andre Noll [Fri, 7 Jun 2013 19:34:51 +0000 (21:34 +0200)]
Merge branch 't/gui_improvements'
Was cooking for more than one month.
bf1831 string: Speed up xvasprintf().
bcc083 string: Add discard feature for for_each_line().
e3868d string: Simplify return value of for_each_line().
d1f0f0 string: Simplify for_each_line().
23b121 string: Clean up for_each_line() and related functions.
6256ed string: Replace the for_each_line_modes enum by a bitmap.
14e689 gui: Don't sleep before executing the status command.
e90c6c gui: Speed up add_spaces().
20e2c6 gui: Rename do_exit().
ef0508 gui: Remove superfluous cmd_died.
d7562b gui: Check stdin for readability.
a44fa6 gui: Discard overlong input lines.
Andre Noll [Sun, 14 Oct 2012 16:44:57 +0000 (18:44 +0200)]
The opus audio format handler.
This fills the dummy files opus_afh.c and opus_common.c which were
introduced in the previous commit with content. One function,
opus_parse_header(), will also be needed by the decoder to
be introduced in the next commit. So this function belongs to
opus_common.c and must be public.
Andre Noll [Sat, 25 May 2013 12:37:41 +0000 (14:37 +0200)]
Merge branch 't/doc'
Simple enough and cooking since 2013-05-05.
e82be0 manual: Add a new paragraph for installing dependencies.
1d6f5f manual: Add missing references of two optional packages.
4a6061 check_wav.c: Fix documentation of check_wav_post_select().
f9c625 Add two missing Copyright headers and file annotations.
16af9d Add documentation of public functions in check_wav.c.
Andre Noll [Sun, 19 May 2013 20:09:52 +0000 (22:09 +0200)]
Fix compilation on Ubuntu precise.
This distro ships glibc-2.15 where clock_gettime() is part of the
realtime library librt. So all executables which call clock_gettime()
must be linked with -lrt. The configure script detects this and adds
-lrt to LDFLAGS. However, -lrt must come *after* the objects to be
linked together, which is currently not the case.
Fix this by moving $(LDFLAGS) to the end of the recipe for the targets
of all executables.
Andre Noll [Wed, 15 May 2013 20:33:24 +0000 (22:33 +0200)]
alsa writer: Do not print uninitialized data.
ALSA's snd_output_buffer_string() returns the current size of valid
data in the returned data buffer, but this buffer is not guaranteed
to be zero-terminated.
Currently alsa_init() ignores this fact and prints the buffer up to
the first NULL byte. Therefore it may print garbage that follows the
valid data in the buffer. If there is no zero byte after the data,
it may even segfault.
Fix this bug by using memchr() instead of strchr() and carefully
tracking the number of bytes processed.
Andre Noll [Sat, 30 Mar 2013 19:12:40 +0000 (19:12 +0000)]
file writer: Use xwrite() instead of plain write().
Currently the file writer's ->post_select() sets t->error to -1 on
errors, rather than using a proper error code. This may result in
a segfault when this number is passed to para_strerror().
Replacing the call to write() by xwrite() not only gives a proper
error code but also treats EAGAIN as a non-fatal error.
Andre Noll [Sat, 18 May 2013 12:06:22 +0000 (14:06 +0200)]
Merge branch 't/sched_improvements'
This topic has been cooking for a month. During this period, one
problem on BSD has been found and fixed.
3ad5b0 Fix build on FreeBSD
484e75 sched: Rename new_post_select back to post_select.
74c880 sched: Kill old ->post_select variant.
c77e19 grab client: Switch to the alternative post select method.
38aeac client supervisor: Switch to the alternative post select method.
e009fa client exec: Switch to the alternative post select method.
742718 i9e: Switch to the alternative post select method.
2e6b8f vss: Switch to the alternative post select method.
6e83b4 stdout: Switch to the alternative post select method.
1995ce stdin: Switch to the alternative post select method.
88b0ec audioc: Switch to the alternative post select method.
b210e8 afs command task: Switch to the alternative post select method.
12f683 afs signal task: Switch to the alternative post select method.
ccef24 server signal task: Switch to the alternative post select method.
a6dabd server command task: Switch to the alternative post select method.
855c53 write: Switch to the alternative post select method.
58b74b play: Switch to the alternative post select method.
cf4982 afh_recv: Switch to the alternative post select method.
4dc05b client: Switch to the alternative post select method.
043fd6 audiod: Switch command_task to the alternative post select method.
ce462a audiod: Switch the status task to the alternative post select method.
a7f2d1 audiod: Switch signal task to the alternative post select method.
ba2f65 osx writer: Switch to the alternative post select method.
3642d2 oss writer: Switch to the alternative post select method.
c29db3 file writer: Switch to the alternative post select method.
36875c ao: Switch to the alternative post select method.
3b3049 alsa: Switch to the alternative post select method.
60b853 wmadec: Switch to the alternative post select method.
6c8719 wav filter: Switch to the alternative post select method.
03e915 spxdec: Switch to the alternative post select method.
24bbc5 resample: Switch to the alternative post select method.
4ca80f prebuffer: Switch to the alternative post select method.
a55083 oggdec: Switch to the alternative post select method.
806d26 mp3dec: Switch to the alternative post select method.
7dcaf5 flacdec: Switch to the alternative post select method.
4dc9b9 fecdec: Switch to the alternative post select method.
f6e2cb compress: Switch to the alternative post select method.
ac3371 amp: Switch to the alternative post select method.
7c2c68 aacdec: Switch to the alternative post select method.
b333e0 dccp_recv: Switch to the alternative post select method.
00e793 udp_recv: Switch to the alternative post select method.
9c00a7 sched: Provide alternative post_select variant.
24758c Replace gettimeofday() by clock_gettime().
01f802 sched: Get rid of (pre)select shortcuts.
5bb44a audiod: Avoid delay when closing slot.
Andre Noll [Fri, 17 May 2013 08:49:10 +0000 (10:49 +0200)]
Fix build on FreeBSD
Commit 24758c5f (Replace gettimeofday() by clock_gettime()) removed
the inclusion of sys/time.h from several files since this header was
believed to be needed only for gettimeofday(), which was removed in
the same commit.
However, this broke the build on FreeBSD since sys/time.h
also pulled in the declaration of u_short, which is required by
/usr/include/netinet/udp.h. Therefore the compilation of udp_send.c
failed with
/usr/include/netinet/udp.h:42: error: expected specifier-qualifier-list before 'u_short'
This patch changes udp_send.c to include sys/types.h, which provides
the missing declaration.
Andre Noll [Tue, 14 May 2013 20:01:21 +0000 (22:01 +0200)]
Merge branch 't/utf8'
Was cooking since 2013-03-10.
a946af string.c: Fix typo in documentation of skip_cells().
251394 Switch to HTF-8 for web pages.
09c6bc gui: Try to link against libncursesw.
36f38a UTF-8 support for para_gui.
a99804 mp3_afh: Switch to UTF-8 encoding.
f78b53 gui: Don't compute string length unnecessarily.
6224f7 Get rid of unused HAVE_NCURSES define.
6cd788 Fix --with-curses configure option.
Andre Noll [Mon, 18 Mar 2013 22:51:46 +0000 (23:51 +0100)]
stdin/stdout: Restore fd flags on shutdown.
The stdin/stdout code should restore the flags to the old value to
avoid surprises, for example in shell scripts.
This changes stdin.c and stdout.c to save the old value. It is
restored in ->post_select when the buffer tree node is removed and
no more I/O takes place.
Andre Noll [Sat, 4 May 2013 18:39:54 +0000 (20:39 +0200)]
wma: Fix sparse error.
wma_common.c defines wma_log2() with __attribute__ ((const)), but the
declaration in wma.h lacks this attribute. Sparse does not like that
and fails with
wma_common.c:147:15: error: symbol 'wma_log2' redeclared with different type (originally declared at wma.h:28) - different modifiers
Andre Noll [Sat, 4 May 2013 16:13:56 +0000 (18:13 +0200)]
aacdec: Fix check of return value of NeAACDecInit2().
This function returns (char)-1 on errors and zero on success. Checking
whether the return value is negative is incorrect on systems where
char is unsigned. On raspberry/ARM, gcc complains:
aacdec_filter.c:126:6: warning: comparison is always false due to limited range of data type [-Wtype-limits]
Andre Noll [Mon, 25 Mar 2013 18:02:54 +0000 (18:02 +0000)]
string: Add discard feature for for_each_line().
This adds the new FELF_DISCARD_FIRST flag which instructs
for_each_line() to discard everything up to the next newline.
The new feature is only used by para_gui. When para_gui detects
a partial overlong input line, it ignores this data and passes the
FELF_DISCARD_FIRST flag in subsequent calls to for_each_line(). Hence
output continues at the next line.