diff options
| author | Max Kellermann <max@duempel.org> | 2012-10-04 07:11:41 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-10-04 10:32:52 +0200 |
| commit | 6b416ce6be840dcd62aadb70817be602b5a73946 (patch) | |
| tree | 61512a747f552e7e5257857ae87d3e3bdb3c0620 | |
| parent | ef0392e854aa5b0388d6245e7d506b1caffb970d (diff) | |
decoder/flac: move flac_scan_file2() to main plugin file
| -rw-r--r-- | src/decoder/FLACDecoderPlugin.cxx | 10 | ||||
| -rw-r--r-- | src/decoder/FLACMetaData.cxx | 15 | ||||
| -rw-r--r-- | 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 |