oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Max Kellermann 2012-10-04 07:11:41 +02:00
parent ef0392e854
commit 6b416ce6be
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/decoder/FLACDecoderPlugin.cxx
View File

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

15
src/decoder/FLACMetaData.cxx
View File

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

4
src/decoder/FLACMetaData.hxx
View File

@ -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