diff options
| author | Max Kellermann <max@duempel.org> | 2009-08-30 09:42:12 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-08-30 09:42:12 +0200 |
| commit | f2ff2409adbd18758edfffd6f6021b521eb66c7d (patch) | |
| tree | a1e6c30ece0d7259861b808fe954c77448afc47c /src | |
| parent | bff4c54ece5d6ebf84c1a19a05afbeba57bf65ae (diff) | |
| parent | 7a690c6b7042315d0756d0a4a45046fc21a1cad8 (diff) | |
| download | mpd-f2ff2409adbd18758edfffd6f6021b521eb66c7d.tar.gz mpd-f2ff2409adbd18758edfffd6f6021b521eb66c7d.tar.xz mpd-f2ff2409adbd18758edfffd6f6021b521eb66c7d.zip | |
Merged release 0.15.3 from branch 'v0.15.x'
Conflicts:
NEWS
configure.ac
Diffstat (limited to '')
| -rwxr-xr-x | src/decoder/vorbis_plugin.c | 2 | ||||
| -rw-r--r-- | src/output_init.c | 1 | ||||
| -rw-r--r-- | src/update.c | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c index 39a075176..4548d1b57 100755 --- a/src/decoder/vorbis_plugin.c +++ b/src/decoder/vorbis_plugin.c @@ -382,7 +382,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; } diff --git a/src/output_init.c b/src/output_init.c index 08873ac20..66444e9a5 100644 --- a/src/output_init.c +++ b/src/output_init.c @@ -178,6 +178,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; /* set up the filter chain */ diff --git a/src/update.c b/src/update.c index 6778a5989..cfe574e17 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)) { |