Hi, I have merged lots of patches from Erics' branch, with some minor additions. I didn't review them thoroughly yet, but I believe they move into the right direction.
In my branch, there are patches optimizing and repairing the FLAC plugin. One patch adds support for 24 bit FLAC files (tested only with ALSA). Thanks to Grant for donating hardware! The 24 bit stuff isn't finished yet, it's just a first note of success. Qball noticed that "addid" was broken. I broke it a while ago, and here's the fix. There are still 11 audio output patches in my queue, which move each audio output to a separate thread. They failed my tests, and I have to fix a sync bug before I publish them. This will hopefully happen this week. Max Eric Wong (18): mp3: fix long line, I can't read past 80 cols Directory: don't allocate stat information dynamically oss: avoid heap allocations when configuring mixer volume: oops, only #include <alloca.h> if OSS is enabled Add prefixcmp() (stol^H^H^H^Hborrowed from git) start using prefixcmp() directory: remove unused updateMp3Directory() function Replace SongList with struct songvec workaround race condition on updates with broken signal blocking Don't try to prune unless we're updating directory: use enum update_return for return values directory: update do its work inside a thread songvec: remove songvec_prune directory: don't leak file handles if we get a corrupt db Remove EINTR checking for open(2) directory: fix leak introduced with threaded update songvec: avoid free(NULL) alsa: re-enable-nonblocking, but sleep if busy Max Kellermann (15): main_notify: use init_async_pipe() main_notify: removed assertion in wakeup_main_task() directory: use enum update_return for return values II properly configure the M4 macro directory audio_format: added audio_format_sample_size() flac: assume the buffer is empty in flacWrite() II flac: moved code from flacWrite() to _flac_common.c flac: use signed integers in flac_convert_stereo16() flac: added optimized converter for 16 bit flac: added special functions for 8 and 32 bit flac: removed generic sample size support flac: merged flacSendChunk() into flac_common_write() flac: removed FlacData.chunk_length command: fix command "addid" doc/COMMANDS: document "addid" Makefile.am | 1 configure.ac | 1 doc/COMMANDS | 8 src/Makefile.am | 2 src/audio.c | 3 src/audioOutputs/audioOutput_alsa.c | 19 - src/audioOutputs/audioOutput_osx.c | 2 src/audioOutputs/audioOutput_shout_mp3.c | 2 src/audioOutputs/audioOutput_shout_ogg.c | 2 src/audio_format.h | 17 - src/command.c | 49 --- src/dbUtils.c | 4 src/directory.c | 485 +++++++++++-------------------- src/directory.h | 16 - src/inputPlugins/_flac_common.c | 133 ++++++++ src/inputPlugins/_flac_common.h | 16 - src/inputPlugins/flac_plugin.c | 78 ---- src/inputPlugins/mp3_plugin.c | 5 src/inputPlugins/oggflac_plugin.c | 46 -- src/ls.c | 3 src/main.c | 4 src/main_notify.c | 11 src/playlist.c | 31 - src/sig_handlers.c | 1 src/song.c | 1 src/song_print.c | 13 src/song_print.h | 4 src/song_save.c | 85 +---- src/song_save.h | 6 src/songvec.c | 68 ++++ src/songvec.h | 22 + src/state_file.c | 3 src/utils.c | 10 src/utils.h | 2 src/volume.c | 37 +- 35 files changed, 560 insertions(+), 630 deletions(-) ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team