From a99202a8a4ebda1fcbedb3b024cab3b25c63adad Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 10 Sep 2009 23:04:01 +0200 Subject: [PATCH] decoder/vorbis: revert "faster tag scanning with ov_test_callback()" This patch made ov_time_total() unusable, and MPD did not know the duration of songs. --- NEWS | 2 ++ src/decoder/vorbis_plugin.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 34a3d3858..47da1a03f 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.15.4 (2009/??/??) +* decoders: + - vorbis: revert "faster tag scanning with ov_test_callback()" ver 0.15.3 (2009/08/29) diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c index 81950eb22..d4f81e91f 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_test_callbacks(fp, &vf, NULL, 0, OV_CALLBACKS_STREAMONLY) < 0) { + if (ov_open(fp, &vf, NULL, 0) < 0) { fclose(fp); return NULL; }