From 48a80d0b859cf77d1eeca62589bab9be7c2ee9a8 Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Sat, 15 Aug 2009 11:57:50 -0700 Subject: [PATCH 1/6] Modify version string to post-release version 0.15.3~git --- NEWS | 3 +++ configure.ac | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index d460f0c9d..15c3ec00e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +ver 0.15.3 (2009/??/??) + + ver 0.15.2 (2009/08/15) * tags: - ape: check the tag size (fixes integer underflow) diff --git a/configure.ac b/configure.ac index b4a5ff529..7b4634307 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.15.2, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.15.3~git, 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) From fd8aa54a90c7e18ab4ff3e4be7bc40e2c475839f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 18 Aug 2009 11:32:54 +0200 Subject: [PATCH 2/6] output_init: initialize the "pause" flag Fix stuttering due to uninitialized variable. --- NEWS | 2 ++ src/output_init.c | 1 + 2 files changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 15c3ec00e..324f054e1 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.15.3 (2009/??/??) +* output: + - fix stuttering due to uninitialized variable ver 0.15.2 (2009/08/15) diff --git a/src/output_init.c b/src/output_init.c index 04609bb76..927424324 100644 --- a/src/output_init.c +++ b/src/output_init.c @@ -109,6 +109,7 @@ audio_output_init(struct audio_output *ao, const struct config_param *param, ao->plugin = plugin; ao->enabled = config_get_block_bool(param, "enabled", true); ao->open = false; + ao->pause = false; ao->fail_timer = NULL; pcm_convert_init(&ao->convert_state); From 9d42f4e0ed81969b4fcf1c20e60e867a2defe636 Mon Sep 17 00:00:00 2001 From: Igor Kuzmin Date: Wed, 19 Aug 2009 21:21:29 +0200 Subject: [PATCH 3/6] update: don't re-read unchanged container files MPD checks if every flac (possibly other types as well) file contains cuesheet on every update, which produces unneeded I/O. My music collection is on NFS share, so it's quite noticeable. IMHO, it shouldn't re-read unchanged files, so I wrote simple patch to fix it. --- NEWS | 1 + src/update.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 324f054e1..dbf780524 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ ver 0.15.3 (2009/??/??) * output: - fix stuttering due to uninitialized variable +* update: don't re-read unchanged container files ver 0.15.2 (2009/08/15) diff --git a/src/update.c b/src/update.c index bdf84ce36..593198cb9 100644 --- a/src/update.c +++ b/src/update.c @@ -502,7 +502,8 @@ update_regular_file(struct directory *directory, { struct song* song = songvec_find(&directory->songs, name); - if (plugin->container_scan != NULL) + if (!(song != NULL && st->st_mtime == song->mtime) && + plugin->container_scan != NULL) { if (update_container_file(directory, name, st, plugin)) { From 408f723701526926a2eba3435a079f0a91b0df66 Mon Sep 17 00:00:00 2001 From: Rasmus Steinke Date: Mon, 24 Aug 2009 22:14:22 +0200 Subject: [PATCH 4/6] decoder/vorbis: faster tag scanning with ov_test_callback() using ov_test_callback with function CALLBACKS_STREAMONLY will cause scanning to stop after the comment field. ov_open (and ov_test) default to CALLBACKS_DEFAULT which scans the file structure causing a huge slowdown. The speed improvement is huge: It scanned my files around 10x faster This procedure has been recommended by monthy (main vorbis developer) and was said to be safe for scanning files. --- NEWS | 2 ++ src/decoder/vorbis_plugin.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index dbf780524..ac31684b0 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.15.3 (2009/??/??) +* decoders: + - vorbis: faster tag scanning with ov_test_callback() * output: - fix stuttering due to uninitialized variable * update: don't re-read unchanged container files diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c index d4f81e91f..81950eb22 100644 --- a/src/decoder/vorbis_plugin.c +++ b/src/decoder/vorbis_plugin.c @@ -383,7 +383,7 @@ vorbis_tag_dup(const char *file) return NULL; } - if (ov_open(fp, &vf, NULL, 0) < 0) { + if (ov_test_callbacks(fp, &vf, NULL, 0, OV_CALLBACKS_STREAMONLY) < 0) { fclose(fp); return NULL; } From edb2fce616c119f1edc2e13569717e8a6990751b Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 23 Aug 2009 10:43:46 +0200 Subject: [PATCH 5/6] Document nextsong and nextsongid. --- doc/protocol.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/doc/protocol.xml b/doc/protocol.xml index 792227a1a..5418ea8f8 100644 --- a/doc/protocol.xml +++ b/doc/protocol.xml @@ -270,6 +270,24 @@ + + + nextsong: + + playlist song number of the next + song to be played + + + + + + nextsongid: + + playlist songid of the next song + to be played + + + time: From 7a690c6b7042315d0756d0a4a45046fc21a1cad8 Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Sat, 29 Aug 2009 22:59:24 -0700 Subject: [PATCH 6/6] mpd version 0.15.3 --- NEWS | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index ac31684b0..2c79c6639 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ver 0.15.3 (2009/??/??) +ver 0.15.3 (2009/08/29) * decoders: - vorbis: faster tag scanning with ov_test_callback() * output: diff --git a/configure.ac b/configure.ac index 7b4634307..665f19b31 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.15.3~git, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.15.3, 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)