From c645b906f32b5ed0f9b206ca5680b19983ce25e2 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 2 Oct 2012 11:24:05 +0200 Subject: decoder/flac: add C++ libFLAC wrappers Not using libFLAC++ because this library adds a lot of overhead due to virtual method calls. This new class library is zero-overhead. --- src/decoder/FLACDecoderPlugin.cxx | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'src/decoder/FLACDecoderPlugin.cxx') diff --git a/src/decoder/FLACDecoderPlugin.cxx b/src/decoder/FLACDecoderPlugin.cxx index d541e6990..5de0ccef3 100644 --- a/src/decoder/FLACDecoderPlugin.cxx +++ b/src/decoder/FLACDecoderPlugin.cxx @@ -366,27 +366,22 @@ static bool oggflac_scan_file(const char *file, const struct tag_handler *handler, void *handler_ctx) { - FLAC__Metadata_Iterator *it; - FLAC__StreamMetadata *block; - FLAC__Metadata_Chain *chain = FLAC__metadata_chain_new(); - - if (!(FLAC__metadata_chain_read_ogg(chain, file))) { - FLAC__metadata_chain_delete(chain); + FLACMetadataChain chain; + if (!chain.ReadOgg(file)) { + g_debug("Failed to read OggFLAC tags: %s", + chain.GetStatusString()); return false; } - it = FLAC__metadata_iterator_new(); - FLAC__metadata_iterator_init(it, chain); - + FLACMetadataIterator iterator(chain); do { - if (!(block = FLAC__metadata_iterator_get_block(it))) + FLAC__StreamMetadata *block = iterator.GetBlock(); + if (block == nullptr) break; flac_scan_metadata(block, handler, handler_ctx); - } while (FLAC__metadata_iterator_next(it)); - FLAC__metadata_iterator_delete(it); + } while (iterator.Next()); - FLAC__metadata_chain_delete(chain); return true; } -- cgit v1.2.3