From 3c2d73d161814a1cac543f2623671feb0b7c8fe9 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 2 Oct 2012 18:24:15 +0200 Subject: decoder/flac: add method FLACMetadataChain::Scan() Merge common code. --- src/decoder/FLACMetaData.cxx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/decoder/FLACMetaData.cxx') diff --git a/src/decoder/FLACMetaData.cxx b/src/decoder/FLACMetaData.cxx index 56c8a2764..8d70f149e 100644 --- a/src/decoder/FLACMetaData.cxx +++ b/src/decoder/FLACMetaData.cxx @@ -250,7 +250,15 @@ flac_scan_file2(const char *file, return false; } - FLACMetadataIterator iterator(chain); + chain.Scan(handler, handler_ctx); + return true; +} + +void +FLACMetadataChain::Scan(const struct tag_handler *handler, void *handler_ctx) +{ + FLACMetadataIterator iterator(*this); + do { FLAC__StreamMetadata *block = iterator.GetBlock(); if (block == nullptr) @@ -258,6 +266,4 @@ flac_scan_file2(const char *file, flac_scan_metadata(block, handler, handler_ctx); } while (iterator.Next()); - - return true; } -- cgit v1.2.3