tag/TagId3: add overload with InputStream& parameter

2 files changed, 30 insertions, 0 deletions

diff --git a/src/tag/TagId3.cxx b/src/tag/TagId3.cxx
index 6c46d1764..14d109391 100644
--- a/src/tag/TagId3.cxx
+++ b/src/tag/TagId3.cxx
@@ -344,6 +344,23 @@ tag_id3_import(struct id3_tag *tag)
 }
 
 bool
+tag_id3_scan(InputStream &is,
+	     const TagHandler &handler, void *handler_ctx)
+{
+	UniqueId3Tag tag;
+
+	try {
+		tag = tag_id3_load(is);
+	} catch (const std::runtime_error &e) {
+		LogError(e);
+		return false;
+	}
+
+	scan_id3_tag(tag.get(), handler, handler_ctx);
+	return true;
+}
+
+bool
 tag_id3_scan(Path path_fs,
 	     const TagHandler &handler, void *handler_ctx)
 {
diff --git a/src/tag/TagId3.hxx b/src/tag/TagId3.hxx
index fb2668c3b..b1146efe2 100644
--- a/src/tag/TagId3.hxx
+++ b/src/tag/TagId3.hxx
@@ -23,6 +23,7 @@
 #include "check.h"
 #include "Compiler.h"
 
+class InputStream;
 class Path;
 struct TagHandler;
 struct Tag;
@@ -31,6 +32,10 @@ struct id3_tag;
 #ifdef ENABLE_ID3TAG
 
 bool
+tag_id3_scan(InputStream &is,
+	     const TagHandler &handler, void *handler_ctx);
+
+bool
 tag_id3_scan(Path path_fs,
 	     const TagHandler &handler, void *handler_ctx);
 
@@ -50,6 +55,14 @@ scan_id3_tag(id3_tag *tag,
 #include "fs/Path.hxx"
 
 static inline bool
+tag_id3_scan(gcc_unused InputStream &is,
+	     gcc_unused const TagHandler &handler,
+	     gcc_unused void *handler_ctx)
+{
+	return false;
+}
+
+static inline bool
 tag_id3_scan(gcc_unused Path path_fs,
 	     gcc_unused const TagHandler &handler,
 	     gcc_unused void *handler_ctx)