From 6b416ce6be840dcd62aadb70817be602b5a73946 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 4 Oct 2012 07:11:41 +0200
Subject: decoder/flac: move flac_scan_file2() to main plugin file

---
 src/decoder/FLACDecoderPlugin.cxx | 10 +++++++++-
 src/decoder/FLACMetaData.cxx      | 15 ---------------
 src/decoder/FLACMetaData.hxx      |  4 ----
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/decoder/FLACDecoderPlugin.cxx b/src/decoder/FLACDecoderPlugin.cxx
index cfe5e5680..b8d5173b5 100644
--- a/src/decoder/FLACDecoderPlugin.cxx
+++ b/src/decoder/FLACDecoderPlugin.cxx
@@ -90,7 +90,15 @@ static bool
 flac_scan_file(const char *file,
 	       const struct tag_handler *handler, void *handler_ctx)
 {
-	return flac_scan_file2(file, handler, handler_ctx);
+	FLACMetadataChain chain;
+	if (!chain.Read(file)) {
+		g_debug("Failed to read FLAC tags: %s",
+			chain.GetStatusString());
+		return false;
+	}
+
+	chain.Scan(handler, handler_ctx);
+	return true;
 }
 
 /**
diff --git a/src/decoder/FLACMetaData.cxx b/src/decoder/FLACMetaData.cxx
index 8d70f149e..158e426db 100644
--- a/src/decoder/FLACMetaData.cxx
+++ b/src/decoder/FLACMetaData.cxx
@@ -239,21 +239,6 @@ flac_vorbis_comments_to_tag(struct tag *tag,
 	flac_scan_comments(comment, &add_tag_handler, tag);
 }
 
-bool
-flac_scan_file2(const char *file,
-		const struct tag_handler *handler, void *handler_ctx)
-{
-	FLACMetadataChain chain;
-	if (!chain.Read(file)) {
-		g_debug("Failed to read FLAC tags: %s",
-			chain.GetStatusString());
-		return false;
-	}
-
-	chain.Scan(handler, handler_ctx);
-	return true;
-}
-
 void
 FLACMetadataChain::Scan(const struct tag_handler *handler, void *handler_ctx)
 {
diff --git a/src/decoder/FLACMetaData.hxx b/src/decoder/FLACMetaData.hxx
index 67dc9fcd7..9808852f3 100644
--- a/src/decoder/FLACMetaData.hxx
+++ b/src/decoder/FLACMetaData.hxx
@@ -117,8 +117,4 @@ void
 flac_scan_metadata(const FLAC__StreamMetadata *block,
 		   const struct tag_handler *handler, void *handler_ctx);
 
-bool
-flac_scan_file2(const char *file,
-		const struct tag_handler *handler, void *handler_ctx);
-
 #endif
-- 
cgit v1.2.3