aboutsummaryrefslogtreecommitdiffstats
path: root/src/output/jack_output_plugin.c (unfollow)
Commit message (Collapse)AuthorFilesLines
2010-03-10output/jack: drain the ring buffers during pauseMax Kellermann1-0/+7
If we're not doing this, and a new song is played after pause ends, then you will hear the rest of the previous song.
2010-03-10output/jack: synchronize all channelsMax Kellermann1-9/+26
Always use the same number of samples from each channel's ring buffer. This ensures that all channels are kept in sync.
2009-12-31Update copyright notices.Avuton Olrich1-1/+1
2009-12-02audio_format: changed "bits" to "enum sample_format"Max Kellermann1-5/+6
This patch prepares support for floating point samples (and probably other formats). It changes the meaning of the "bits" attribute from a bit count to a symbolic value.
2009-11-12include config.h in all sourcesMax Kellermann1-1/+1
After we've been hit by Large File Support problems several times in the past week (which only occur on 32 bit platforms, which I don't have), this is yet another attempt to fix the issue.
2009-11-07output/jack: added option "server_name"Max Kellermann1-1/+8
2009-11-07output/jack: free source port names on exitMax Kellermann1-0/+3
Make valgrind happy.
2009-11-06output/jack: dynamic source port listMax Kellermann1-37/+74
Same as the previous patch: create up to 16 configured source ports. The plugin tries to do its best at guessing the right combination for the given input file, the number of source and destination ports.
2009-11-06output/jack: dynamic destination port listMax Kellermann1-25/+71
Support up to 16 configured destination ports, that should really be enough for everybody.
2009-11-06output/jack: renamed option "ports" to "destination_ports"Max Kellermann1-1/+9
Be more clear which kind of port should be configured here.
2009-11-06output/jack: renamed "output ports" to "destination ports"Max Kellermann1-18/+20
Use the same name as in the libjack API documentation.
2009-11-05output/jack: support mono inputMax Kellermann1-13/+41
When MPD plays a mono song (audio_format.channel==1), connect only one source port to both destination ports.
2009-11-05output/jack: clear ring buffers before activatingMax Kellermann1-1/+6
After playback has stopped, the ring buffers may still contain samples. These will be played when playback is started the next time. We should clear the buffers each time.
2009-11-05output/jack: use jack_client_open() instead of jack_client_new()Max Kellermann1-4/+23
jack_client_new() is deprecated. This requires libjack 0.100 (released nearly 5 years ago). We havn't been testing older libjack versions anyway. As a side effect, there is the new option "autostart".
2009-11-05output/jack: added option "client_name"Max Kellermann1-3/+2
Instead of using MPD's audio output name (setting "name"), use a separate configuration option. Change the default to "Music Player Daemon".
2009-10-23output/jack: implement methods enable()/disable()Max Kellermann1-16/+24
Don't connect to JACK before MPD has daemonized.
2009-10-21output/jack: make ringbuffer_size a size_tMax Kellermann1-1/+1
2009-10-21output/jack: connect to server on MPD startupMax Kellermann1-69/+119
.. and keep up the JACK connection while MPD runs. Allocate the ring buffers on the first open, and free them at MPD exit.
2009-10-21output/jack: removed the empty "cancel" methodMax Kellermann1-6/+0
JACK doesn't need cancel() because it won't do much anyway. Buffers are small.
2009-10-21output/jack: renamed parameter "error" to "error_r"Max Kellermann1-12/+12
It's a double pointer.
2009-10-21output/jack: implement the "pause" methodMax Kellermann1-0/+41
Don't disconnect from JACK during pause.
2009-10-21output/jack: renamed source to jack_output_plugin.cMax Kellermann1-2/+2
2009-03-13all: Update copyright header.Avuton Olrich1-5/+7
This updates the copyright header to all be the same, which is pretty much an update of where to mail request for a copy of the GPL and the years of the MPD project. This also puts all committers under 'The Music Player Project' umbrella. These entries should go individually in the AUTHORS file, for consistancy.
2009-03-01output: removed duplicate debug messages from pluginsMax Kellermann1-1/+0
The MPD core logs the audio format of all audio outputs. Remove the duplicate message from the plugins.
2009-02-26output_plugin: report errors with GErrorMax Kellermann1-21/+40
Use GLib's GError library for reporting output device failures. Note that some init() methods don't clean up properly after a failure, but that's ok for now, because the MPD core will abort anyway.
2009-02-25output_plugin: don't pass audio_output object to method init()Max Kellermann1-2/+1
audio_output_get_name() has been removed, which was the only function left in output_api.h. The output plugin doesn't need the audio_output object at all, remove the parameter from the init() method.
2009-02-25output_api: removed audio_output_get_name()Max Kellermann1-10/+4
Use config_get_block_string("name") instead of audio_output_get_name().
2009-02-24jack: initialize local variable "space"Max Kellermann1-1/+1
Fix a gcc warning, initialize the "space" variable at the beginning of mpd_jack_play().
2009-02-23output: pass the music chunk pointer as void*, not char*Max Kellermann1-2/+2
The meaning of the chunk depends on the audio format; don't suggest a specific format by declaring the pointer as "char*", pass "void*" instead.
2009-02-23output_api: play() returns a lengthMax Kellermann1-18/+15
The old API required an output plugin to not return until all data passed to the play() method is consumed. Some output plugins have to loop to fulfill that requirement, and may block during that. Simplify these, by letting them consume only part of the buffer: make play() return the length of the consumed data.
2009-02-19utils: use g_usleep() instead of my_usleep()Max Kellermann1-2/+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.
2009-02-16output_api: don't include config.hMax Kellermann1-0/+1
If an output plugin requires config.h, it should include it directly.
2009-01-30jack: don't override output_ports in connect()Max Kellermann1-10/+22
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.
2009-01-30jack: removed sample_rate callbackMax Kellermann1-20/+7
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.
2009-01-30configure.ac: detect jack_set_info_function()Max Kellermann1-0/+5
jack_set_info_function() is not provided by older libjack versions. Attempt to detect if it is available.
2009-01-30jack: print info messagesMax Kellermann1-0/+7
Use jack_set_info_function() to install an info callback. Don't let libjack print them to stderr.
2009-01-29jack: don't manually close on shutdownMax Kellermann1-3/+1
Return false from mpd_jack_play(), let the MPD core close the device.
2009-01-29jack: initialize output_ports if not configuredMax Kellermann1-0/+3
Don't leave uninitialized bytes in the jack_data struct.
2009-01-29jack: close JACK client on stopMax Kellermann1-4/+4
When MPD stops playback, close the JACK client connection.
2009-01-29jack: removed "bps" attributeMax Kellermann1-5/+1
The "bps" attribute is calculated, but never used.
2009-01-29jack: make mpd_jack_connect() return boolMax Kellermann1-10/+10
Return true/false instead of 1/-1.
2009-01-29jack: use loops for allocating/freeing ports/buffersMax Kellermann1-36/+32
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.
2009-01-29jack: fail if jack_get_ports() returns NULLMax Kellermann1-19/+23
When jack_get_ports() returns NULL, we cannot have any ports to connect to, and the device cannot play anything.
2009-01-29jack: use jack_port_name() instead of g_malloc()+sprintf()Max Kellermann1-12/+2
libjack's jack_port_name() function returns the effective port name, we don't need to do it manually.
2009-01-29jack: initialize libjack's error function in mpd_jack_init()Max Kellermann1-1/+2
Do the global libjack initialization in the global plugin initialization function.
2009-01-29jack: reduced sleep time to 1msMax Kellermann1-1/+1
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.
2009-01-29jack: clear "shutdown" flag on reconnectMax Kellermann1-0/+2
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).
2009-01-29jack: allocate ring buffers before connectingMax Kellermann1-5/+3
If the ring buffers are allocated after jack_activate(), mpd_jack_process() might segfault because it attempts to access them.
2009-01-29jack: register ports before activating clientsMax Kellermann1-5/+5
Call jack_port_register() before jack_activate().
2009-01-25use g_free() instead of free()Max Kellermann1-4/+4
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.