| Commit message (Collapse) | Author | Files | Lines |
|
The method implementation my_shout_open_device() consists of only one
line, the call to open_shout_conn(). Merge both functions into one.
|
|
Return true/false instead of 0/-1.
|
|
Now that I've found this nice function in the GLib docs, we can
finally remove our custom sleep function. Still all those callers of
g_usleep() have to be migrated one day to use events, instead of
regular polling.
|
|
If an output plugin requires config.h, it should include it directly.
|
|
The output plugin shouldn't know any specifics of the mixer API. Make
it return the mixer object, and let the caller deal with it.
|
|
Use audio_format_frame_size() instead of
channels*audio_format_sample_size().
|
|
Pass the music chunk as a "const void *" to the encoder, instead of a
"const char *". Actually, both encoders currently expect 16 bit
samples, passing a 8-bit character is rather pointless.
|
|
For simplification, moved the PCM conversion code to
pcm16_to_ogg_buffer(). Work with a int16_t pointer instead of a char
pointer.
|
|
writeSize is a memory size and its type should thus be size_t. This
allows us to remove two explicit casts.
|
|
Nobody needs these debug messages anymore.
|
|
Always assume the buffer is empty before calling the encoder. Always
flush the buffer immediately after there has been added something.
This reduces the risk of buffer overruns, because there will never be
a "rest" in the current buffer.
|
|
Don't duplicate the tag received by the send_metadata() method - send
it to the shout server directly.
|
|
Removed the manual timer synchronization from the shout plugin.
libshout's shout_sync() function does it for us.
|
|
The non-blocking mode of libshout is sparsely documented, and MPD's
implementation had several bugs. Also removed connect throttling
code, that is done by the MPD core since 0.14.
|
|
When shout_data.tag!=NULL, there is a "tag to send". The tag_to_send
flag is redundant.
|
|
That variable is set in handle_shout_error(), but is never read.
|
|
The shout_mp3 encoder had two bugs: when no song was ever played, MPD
segfaulted during cleanup. Second bug: memory leak, each time the
shout device was opened, lame_init() was called again, and
lame_close() is only called once during shutdown.
Fix this by shutting down LAME each time the clear_encoder() method is
called.
|
|
Make valgrind a little bit happier: free the global lame_data struct
in the finish() method.
|
|
Move the "while" loop which checks for commands to the caller
ao_pause(). This simplifies the pause() method, and lets us remove
audio_output_is_pending().
|
|
The function is only used by the MVP output plugin, and this one call
is wrong.
|
|
If no ports are configured, don't overwrite the (NULL) configuration
with the port names of the first JACK server. If the server changes
after a JACK reconnect, MPD won't attempt to auto-detect again.
|
|
Currently, the JACK plugin manipulates the audio_format struct which
was passed to the open() method. This is very likely to break,
because the plugin must not permanently store this pointer. After
this patch, MPD ignores sample rate changes. It looks like other
software is doing the same, and I guess this is a non-issue.
This patch converts the audio_format pointer within jack_data into a
static audio_format struct.
|
|
jack_set_info_function() is not provided by older libjack versions.
Attempt to detect if it is available.
|
|
Use jack_set_info_function() to install an info callback. Don't let
libjack print them to stderr.
|
|
Return false from mpd_jack_play(), let the MPD core close the device.
|
|
Don't leave uninitialized bytes in the jack_data struct.
|
|
When MPD stops playback, close the JACK client connection.
|
|
The "bps" attribute is calculated, but never used.
|
|
Return true/false instead of 1/-1.
|
|
Preparation for supporting other channel numbers than stereo: use
loops instead of duplicating code for the second channel. Most
likely, gcc will unroll these loops, so the binary won't be any
different.
|
|
When jack_get_ports() returns NULL, we cannot have any ports to
connect to, and the device cannot play anything.
|
|
libjack's jack_port_name() function returns the effective port name,
we don't need to do it manually.
|
|
Do the global libjack initialization in the global plugin
initialization function.
|
|
When waiting for free space in the ring buffer, the JACK plugin
sleeped 10ms until there is enough space. This delay was too large
for low-latency setups (<10ms), and created a lot of xruns. Work
around that by reducing the sleep time to 1ms.
A proper solution for this would be to use an event based approach,
and we will do it, just not now.
|
|
When the connection failed once, you had to restart MPD, because it
never cleared the jack_data.shutdown flag. Instead, it refused to
play anything "because there is no client thread" (which is wrong at
that point).
|
|
If the ring buffers are allocated after jack_activate(),
mpd_jack_process() might segfault because it attempts to access them.
|
|
Call jack_port_register() before jack_activate().
|
|
On some platforms, g_free() must be used for memory allocated by
GLib. This patch intends to correct a lot of occurrences, but is
probably not complete.
|
|
Allocate the mixer object when it is configured.
Merged mixer_configure() into mixer_new(). mixer_new() was quite
useless anyway.
|
|
Don't use statically allocated mixer objects.
|
|
Return the default value in the conf_get_block_*() functions when
param==NULL was passed.
This simplifies a lot of code, because all initialization can be done
in one code path, regardless whether configuration is present.
|
|
All config_get_block_*() functions should accept constant config_param
pointers.
|
|
Document alsa_data members.
|
|
frame_size is a memory size and should be a size_t, not a signed integer.
|
|
Renamed types, functions, variables.
|
|
Two bugs here led to a large number of interrupts being generated on the
sound card when ALSA output is being used. Because we specify no default
period_time, the sound card gives us 3000 interrupts/sec rather than a more
sane 20 or 30. This completes the revert of dd7711 already started by
4ca24f.
The larger bug was in the change to config_get_block_unsigned() and using 0
as the default value for both 'buffer_time' and 'period_time'. This means
any pre-setting of these options in newAlsaData() gets wiped out. Add a new
default for period_time, and ensure default values for buffer_time and
period_time are used if none are provided by the user.
Signed-off-by: Dan McGee <dan@archlinux.org>
[mk: set defaults in newAlsaData() to fix auto-configuration; renamed
"_MS" back to "_US" because ALSA expects microseconds, not milliseconds]
Signed-off-by: Max Kellermann <max@duempel.org>
|
|
The null plugin synchronizes the playback so it will happen in real
time. This patch adds a configuration option which disables this: the
playback will then be as fast as possible. This can be useful to
profile MPD.
|
|
Free memory in the finish() method to make valgrind happy.
|
|
Renamed functions and variables.
|
|
Eliminate some more getBlockParam() invocations.
|