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

decoder/flac: add method FLACMetadataChain::Scan()

Browse Source 
Merge common code.
This commit is contained in:
Max Kellermann 2012-10-02 18:24:15 +02:00
parent 343de8b8ab
commit 3c2d73d161
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/decoder/FLACDecoderPlugin.cxx
View File

@ -373,15 +373,7 @@ oggflac_scan_file(const char *file,
return false;
}
FLACMetadataIterator iterator(chain);
do {
FLAC__StreamMetadata *block = iterator.GetBlock();
if (block == nullptr)
break;
flac_scan_metadata(block, handler, handler_ctx);
} while (iterator.Next());
chain.Scan(handler, handler_ctx);
return true;
}

12
src/decoder/FLACMetaData.cxx
View File

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

2
src/decoder/FLACMetaData.hxx
View File

@ -58,6 +58,8 @@ public:
const char *GetStatusString() const {
return FLAC__Metadata_ChainStatusString[GetStatus()];
}
void Scan(const struct tag_handler *handler, void *handler_ctx);
};
class FLACMetadataIterator {