decoder/flac: move flac_scan_file2() to main plugin file

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;
 }
 
 /**

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)
 {

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