aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xsrc/decoder/vorbis_plugin.c2
-rw-r--r--src/output_init.c1
-rw-r--r--src/update.c3
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))
{