oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged release 0.15.3 from branch 'v0.15.x'

Browse Source 
Conflicts:

	NEWS
	configure.ac
This commit is contained in:
Max Kellermann
2009-08-30 09:42:12 +02:00
parent bff4c54ece 7a690c6b70
commit f2ff2409ad
5 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/decoder/vorbis_plugin.c
View File

@@ -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;
}

1
src/output_init.c
View File

@@ -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 */

3
src/update.c
View File

@@ -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))
{