From ccbb5c3e01682ccdd44a34b66a2eb213b2a1d661 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 10 Jul 2014 09:32:33 +0200
Subject: [PATCH] decoder/audiofile: log libaudiofile errors

---
 NEWS                                          |  1 +
 .../plugins/AudiofileDecoderPlugin.cxx        | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 28c155a23..29bbcb73d 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,7 @@ ver 0.19 (not yet released)
 * decoder:
   - vorbis, flac, opus: honor DESCRIPTION= tag in Xiph-based files as a comment to the song
   - audiofile: support scanning remote files
+  - audiofile: log libaudiofile errors
 * encoder:
   - shine: new encoder plugin
 * threads:
diff --git a/src/decoder/plugins/AudiofileDecoderPlugin.cxx b/src/decoder/plugins/AudiofileDecoderPlugin.cxx
index 324dacfed..603f714d1 100644
--- a/src/decoder/plugins/AudiofileDecoderPlugin.cxx
+++ b/src/decoder/plugins/AudiofileDecoderPlugin.cxx
@@ -36,6 +36,19 @@
 
 static constexpr Domain audiofile_domain("audiofile");
 
+static void
+audiofile_error_func(long, const char *msg)
+{
+	LogWarning(audiofile_domain, msg);
+}
+
+static bool
+audiofile_init(const config_param &)
+{
+	afSetErrorHandler(audiofile_error_func);
+	return true;
+}
+
 struct AudioFileInputStream {
 	Decoder *const decoder;
 	InputStream &is;
@@ -178,10 +191,8 @@ audiofile_stream_decode(Decoder &decoder, InputStream &is)
 	AFvirtualfile *const vf = setup_virtual_fops(afis);
 
 	const AFfilehandle fh = afOpenVirtualFile(vf, "r", nullptr);
-	if (fh == AF_NULL_FILEHANDLE) {
-		LogWarning(audiofile_domain, "failed to input stream");
+	if (fh == AF_NULL_FILEHANDLE)
 		return;
-	}
 
 	Error error;
 	AudioFormat audio_format;
@@ -275,7 +286,7 @@ static const char *const audiofile_mime_types[] = {
 
 const struct DecoderPlugin audiofile_decoder_plugin = {
 	"audiofile",
-	nullptr,
+	audiofile_init,
 	nullptr,
 	audiofile_stream_decode,
 	nullptr,