aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Cleaned up update_regular_file() method in update.cJochen Keil2009-03-101-83/+88
| | | | | | | After adding the container_scan() method the update_regular_file() method was quite hard to read. Now there's update_container_file() which deals with container files. That way normal container files (i.e. without embedded tracks) are handled by the old code like a regular file. This will fix some of the odd behaviour observed.
* alsa: use snd_pcm_sframes_t instead of intMax Kellermann2009-03-101-2/+1
| | | | | snd_pcm_writei() returns the type snd_pcm_sframes_t, not int. Use the correct variable type.
* alsa: don't close PCM handle in alsa_recover()Max Kellermann2009-03-101-13/+3
| | | | | | If the PCM handle gets disconnected, don't close and clear it in alsa_recover(). The MPD core will call alsa_close() anyway. This way, we can always assume that alsa_data.pcm is always valid.
* player_thread: fill buffer after seekingMax Kellermann2009-03-102-3/+10
| | | | | | After a seek, wait until enough new chunks are decoded before starting playback. If this takes too long, send silence chunks to the audio outputs meanwhile.
* output_all: clear input_audio_format on closeMax Kellermann2009-03-101-0/+2
| | | | | | When the audio outputs are closed, also clear the audio format. If we don't do this, every call to audio_output_all_update() will open the device, even if it's meant to be paused.
* output_all: don't allow audio_format==NULL in audio_output_all_open()Max Kellermann2009-03-101-5/+3
| | | | | | Don't allow reopening an audio device after pause with audio_format==NULL, force the caller to provide the audio_format each time.
* player_thread: pass format to audio_output_all_open() after resumeMax Kellermann2009-03-101-8/+12
| | | | | | | When playback is unpaused, pass the audio_format to audio_output_all_open(). Don't assume that output_all.c remembers the previous audio format. Also check if there has been an audio format yet.
* player_thread: moved code to player_send_silence()Max Kellermann2009-03-101-22/+39
|
* output_thread: check commands while playingMax Kellermann2009-03-101-1/+1
| | | | | | | Check audio_output.command after each sub-chunk has been played. It discards the rest of the chunk, but since all commands make the device stop anyway, this is not a problem, but part of the improvement. This improves the latency of audio output commands.
* player_thread: finish failed seek commandMax Kellermann2009-03-101-1/+5
| | | | | | When seeking into a new song, and the decoder for the new song fails to start up, MPD forgot to send the "command_finished" signal to the main thread.
* player_thread: clear player.queued after failureMax Kellermann2009-03-101-0/+1
| | | | | | When pc.next_song is reset due to a decoder failure, also reset the player.queued flag. player.queued must not be true when there is no pc.next_song.
* player_thread: moved code to player_seek_decoder()Max Kellermann2009-03-101-12/+15
| | | | | | Reset player.xfade and player.buffering from within player_seek_decoder(), not in the player_process_command() switch statement.
* music_chunk: increased chunk size to 4 kBMax Kellermann2009-03-101-2/+1
| | | | | | | | A larger chunk size means less overhead for managing them. 4 kB seems to be a reasonable choice: it contains 23 ms of 44.1 kHz 16 bit stereo data, or 3 ms of 192 kHz 24 bit stereo data. The original value of 1020 seemed to be too small, there were quite a lot of system calls and context switches.
* test: added program "run_output"Max Kellermann2009-03-103-0/+191
| | | | | The "run_output" program can be used to test an audio output plugin in an isolated environment.
* Makefile.am: moved file names to $(OUTPUT_API_SRC)Max Kellermann2009-03-101-3/+5
|
* player_thread: don't free music buffer after decoder failureMax Kellermann2009-03-101-1/+0
| | | | | The music_buffer is a global variable, and must not be freed until the player thread exits.
* output: play from a music_pipe objectMax Kellermann2009-03-098-113/+378
| | | | | | | | Instead of passing individual buffers to audio_output_all_play(), pass music_chunk objects. Append all those chunks asynchronously to a music_pipe instance. All output threads may then read chunks from this pipe. This reduces MPD's internal latency by an order of magnitude.
* player_thread: don't open audio device when pausedMax Kellermann2009-03-091-4/+2
| | | | | | When a PAUSE command is received while the decoder starts, don't open the audio device when the decoder becomes ready. It's pointless, because MPD will close if after that.
* music_pipe: added music_pipe_contains()Max Kellermann2009-03-092-0/+30
|
* player_thread: moved code to player_song_border()Max Kellermann2009-03-091-6/+19
| | | | Moved some more cruft out of do_play().
* player_thread: moved code to play_next_chunk()Max Kellermann2009-03-091-73/+103
| | | | Moved some cruft out of do_play().
* player_thread: make the music_buffer instance globalMax Kellermann2009-03-091-14/+15
| | | | | | Preparation for the next patch: since the output devices stay open even when the player thread stops playing, we will need a persistent music buffer.
* output_control: make audio_output_open() staticMax Kellermann2009-03-092-5/+1
| | | | | audio_output_open() is only called by audio_output_update(). Don't export it.
* music_buffer: poison unallocated chunksMax Kellermann2009-03-091-0/+5
| | | | | When a music chunk is freed (returned to the buffer), poison its memory.
* poison: added valgrind supportMax Kellermann2009-03-092-0/+15
| | | | | | If the header valgrind/memcheck.h is available, add VALGRIND_MAKE_MEM_NOACCESS() and VALGRIND_MAKE_MEM_UNDEFINED() support, which enables nice warnings in the valgrind memory checker.
* added memory poisoning libraryMax Kellermann2009-03-092-0/+62
| | | | | Memory poisoning is useful for marking memory regions as "undefined". This poisoning only enabled in the debug build (!NDEBUG).
* output_thread: wait 10 seconds before reopening after play failureMax Kellermann2009-03-092-0/+5
| | | | | | This is similar to the MPD 0.14 patch "wait 10 seconds before reopening a failed device", which only covered open() failures. This patch adds the same feature for play().
* Fix remove-flac-song-on-every-updateJochen Keil2009-03-091-7/+7
| | | | | | | Until now every flac file got removed unconditionally (and then re-added) whenever the update command was issued. Now there is a check if we need to that, so the file will only be removed if there is a embedded cuesheet in that file
* Initial support for embedded cue sheets found in flac filesJochen Keil2009-03-094-7/+464
| | | | | | | | | So far only seekpoints are supported, so no proper tagging yet except for track number and track length. Tagging should be done by parsing the cue sheet which is often embedded as vorbis comment in flac files. Furthermore the pathname should be configurable like "%A - %t - %T", where %A means Artist, %t track number and %T Title or so.
* decoder_plugin: added method container_scan()Jochen Keil2009-03-095-20/+136
| | | | | [mk: fixed whitespace errors; use delete_song() instead of songvec_delete()]
* music_chunk: added assertions on the audio formatMax Kellermann2009-03-085-0/+89
| | | | | | | In !NDEBUG, remember which audio_format is stored in every chunk and every pipe. Check the audio_format of every new data block appended to the music_chunk, and the format of every new chunk appended to the music_pipe.
* output_thread: print "closed" debug messageMax Kellermann2009-03-081-0/+2
|
* alsa: determine buffer_time if not already knownMax Kellermann2009-03-081-0/+5
| | | | | | This patch fixes a theoretical (but practically impossible) flaw: the variable "buffer_time" may be uninitialized when it is used. Initialize the variable with snd_pcm_hw_params_get_buffer_time().
* alsa: better period_time default value for high sample ratesMax Kellermann2009-03-082-3/+9
| | | | | | | | | | | | | | | | | | The default values for buffer_time and period_time were both capped by the hardware limits on practically all chips. The result was a period_time which was half as big as the buffer_time. On some chips, this led to lots of underruns when using a high sample rate (192 kHz), because MPD had very little time to send new samples to ALSA. A period time which is one fourth of the buffer time turned out to be much better. If no period_time is configured, see how much buffer_time the hardware accepts, and try to configure one fourth of it as period_time, instead of hard-coding the default period_time value. This is yet another attempt to provide a solution which is valid for all sound chips. Using the SND_PCM_NONBLOCK flag also seemed to solve the underruns, but put a lot more CPU load to MPD.
* output_all: fix boolean short circuit in update()Max Kellermann2009-03-071-2/+2
| | | | | | | Sometimes, audio_output_update() isn't called for the second device when the first one has succeeded. The patch "audio_output_all_update() returns bool" broke it, because the boolean evaluation ended after the first "true".
* player_thread: moved code to player_check_decoder_startup()Max Kellermann2009-03-071-40/+69
|
* configure.ac: fix --enable-bzip2 and --enable-iso9660 variable nameMax Kellermann2009-03-071-14/+14
| | | | Another "remove redundant explicit $enableval assignments" breakage.
* music_pipe: refuse to push empty chunksMax Kellermann2009-03-071-0/+4
| | | | Added two assertions.
* decoder_internal: don't push empty chunk into pipeMax Kellermann2009-03-071-1/+6
| | | | | | When the decoder chunk is empty in decoder_flush_chunk(), don't push it into the music pipe - return it to the music buffer instead. An empty chunk in the pipe wastes resources for no advantage.
* chunk: added music_chunk_is_empty()Max Kellermann2009-03-071-0/+6
|
* music_pipe: poison music_chunk.nextMax Kellermann2009-03-071-0/+5
| | | | | | The value of music_chunk.next is undefined for a chunk returned by music_pipe_shift(). For more pedantic debugging, poison the reference before returning the chunk.
* music_pipe: added music_pipe_peek()Max Kellermann2009-03-072-0/+13
| | | | | music_pipe_peek() is similar to music_pipe_shift(), but doesn't remove the chunk. This allows it to be used with a "const" music_pipe.
* output_all: audio_output_all_update() returns boolMax Kellermann2009-03-073-6/+19
| | | | | audio_output_all_update() returns true when there is at least open output device which is open.
* pulse_mixer: allow mpd to reconnect to the pulse mixerDavid Guibert2009-03-071-29/+24
| | | | | | | | | | | | | | | | | | | | | | | | | This patch follows the commit 21bb10f4b. >From Max Kellermann: > I removed the daemonization changes in main.c. Please explain why you > changed that. If you need it for some reason, make that a separate > patch with a good description of your rationale. > That's the biggest flaw of your code: it opens the mixer device in the > init() method, while the open() method is empty. When the pulse > daemon is not available (either during MPD startup or when it dies > while MPD runs), the plugin will not even attempt to reconnect to > pulse. Please move the code to the open() method, to make that work. I changed the daemonize call as the fork losts the connection to the pulse server. According to your remark, the init() method should be moved to the open() ones. With the modification, mpd is able to reconnect the pulse mixer after restarting the pulseaudio daemon. Signed-off-by: David Guibert <david.guibert@gmail.com> Signed-off-by: Max Kellermann <max@duempel.org>
* AUTHORS: added Romain Bignon, Rasmus SteinkeMax Kellermann2009-03-071-9/+17
| | | | | | Added two new team members. Updated the description of older contributors. Moved José Anarch and Patrik Weiskircher to "former developers".
* pulse_mixer: added missing copyright headerMax Kellermann2009-03-071-0/+18
|
* pulse_mixer: added GLib log domainMax Kellermann2009-03-071-14/+16
| | | | Shorten some log messages, let GLib add the "pulse_mixer" prefix.
* pulse: clean up includesMax Kellermann2009-03-071-2/+4
| | | | | Don't include output_api.h - this is not an output plugin. Added missing explicit conf.h and string.h includes.
* pulse mixerDavid Guibert2009-03-074-0/+295
| | | | | | | | | | | | | | | | | | | | This patch introduces the mixer for the pulse output. Technically speaking, the pulse index is needed to get or set the volume. You must define callback fonctions to get this index since the pulse output in mpd is done using the simpe api. The pulse simple api does not provide the index of the newly defined output. So callback fonctions are associated to the pulse context. The list of all the sink input is then retreived. Then we select the name of the mpd pulse output and control its volume by its associated index number. Signed-off-by: Patrice Linel <patnathanael@gmail.com> Signed-off-by: David Guibert <david.guibert@gmail.com> [mk: fixed whitespace errors and broke long lines; removed daemonization changes from main.c]
* mixer: check for init() failuresMax Kellermann2009-03-071-1/+1
| | | | | When the init() method of a mixer plugin fails, mixer_new() dereferences the NULL pointer.