From a1939f396618cd7c68d66bc388f051f137c163c6 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 26 Dec 2009 02:58:17 +0100 Subject: Makefile.am: create doxygen output directory --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index aadeb2508..cd5d406c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -748,6 +748,7 @@ DOCBOOK_HTML = endif doc/api/html/index.html: doc/doxygen.conf + @mkdir -p $(@D) $(DOXYGEN) $< all-local: $(DOCBOOK_HTML) doc/api/html/index.html -- cgit v1.2.3 From 8a6d448aaf2095a691982eb7c2942dbad125a755 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 26 Dec 2009 00:35:05 +0100 Subject: decoder/wavpack: allow fine-grained seeking First multiply the floating point return value of decoder_seek_where(), then cast to integer. --- NEWS | 1 + src/decoder/wavpack_plugin.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index cd39e9066..24ded72e2 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,7 @@ ver 0.15.7 (2009/??/??) - id3: fix ID3v1 charset conversion * decoders: - ffmpeg: don't try to force stereo + - wavpack: allow fine-grained seeking * mixer: explicitly close all mixers on shutdown * mapper: fix memory leak when playlist_directory is not set * mapper: apply filesystem_charset to playlists diff --git a/src/decoder/wavpack_plugin.c b/src/decoder/wavpack_plugin.c index 645c8962e..7ad3a62b0 100644 --- a/src/decoder/wavpack_plugin.c +++ b/src/decoder/wavpack_plugin.c @@ -185,10 +185,9 @@ wavpack_decode(struct decoder *decoder, WavpackContext *wpc, bool can_seek, do { if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK) { if (can_seek) { - int where; + unsigned where = decoder_seek_where(decoder) * + audio_format.sample_rate; - where = decoder_seek_where(decoder); - where *= audio_format.sample_rate; if (WavpackSeekSample(wpc, where)) { position = where; decoder_command_finished(decoder); -- cgit v1.2.3 From 915d1d0738c1327d30ad1d2a9d58fa96fb136db8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 26 Dec 2009 01:10:23 +0100 Subject: decoder_thread: eliminate jitter after seek failure Don't clear the music pipe when seeking has failed - check the "seeking" flag instead of "command==SEEK". Clear the "seeking" flag in decoder_seek_error(). --- NEWS | 1 + src/decoder_api.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 24ded72e2..4134ea085 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,7 @@ ver 0.15.7 (2009/??/??) * tags: - id3: fix ID3v1 charset conversion * decoders: + - eliminate jitter after seek failure - ffmpeg: don't try to force stereo - wavpack: allow fine-grained seeking * mixer: explicitly close all mixers on shutdown diff --git a/src/decoder_api.c b/src/decoder_api.c index 2ece3bb98..c696ba101 100644 --- a/src/decoder_api.c +++ b/src/decoder_api.c @@ -93,7 +93,9 @@ void decoder_command_finished(G_GNUC_UNUSED struct decoder * decoder) dc.seek_error || decoder->seeking); assert(dc.pipe != NULL); - if (dc.command == DECODE_COMMAND_SEEK) { + if (decoder->seeking) { + decoder->seeking = false; + /* delete frames from the old song position */ if (decoder->chunk != NULL) { @@ -124,6 +126,8 @@ void decoder_seek_error(struct decoder * decoder) assert(dc.pipe != NULL); dc.seek_error = true; + decoder->seeking = false; + decoder_command_finished(decoder); } -- cgit v1.2.3 From d66c055fec3923dd38e5b28d74c1c4e7e70040db Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 27 Dec 2009 16:49:04 +0100 Subject: dbUtils: return multiple tag values per song When collecting tag values for the result set, add all of a song's tag values of the searched type. This affects the "list" command. Previously, "list" only considered the first tag value of a song. --- NEWS | 1 + src/dbUtils.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 4134ea085..753aaac45 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,7 @@ ver 0.15.7 (2009/??/??) * mapper: fix memory leak when playlist_directory is not set * mapper: apply filesystem_charset to playlists * command: verify playlist name in the "rm" command +* database: return multiple tag values per song ver 0.15.6 (2009/11/18) diff --git a/src/dbUtils.c b/src/dbUtils.c index f89148c1b..fa2cfa27a 100644 --- a/src/dbUtils.c +++ b/src/dbUtils.c @@ -246,7 +246,6 @@ visitTag(struct client *client, struct strset *set, for (unsigned i = 0; i < tag->num_items; i++) { if (tag->items[i]->type == tagType) { strset_add(set, tag->items[i]->value); - return; } } -- cgit v1.2.3 From b1cc760aa5d99f726f52b4c17e06a9f72a0ef58a Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Sun, 27 Dec 2009 08:31:47 -0800 Subject: mpd version 0.15.7 --- NEWS | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 753aaac45..04aca91f4 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ver 0.15.7 (2009/??/??) +ver 0.15.7 (2009/12/27) * archive: - close archive when stream is closed - iso, zip: fixed memory leak in destructor diff --git a/configure.ac b/configure.ac index dcb8a1824..724785ff4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.15.7~git, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.15.7, musicpd-dev-team@lists.sourceforge.net) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2]) AM_CONFIG_HEADER(config.h) -- cgit v1.2.3