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

decoder/flac: don't use FLAC__Metadata_SimpleIterator

Browse Source 
Use the new FLACMetadataIterator C++ class, which is more powerful.
This commit is contained in:
Max Kellermann
2012-10-02 17:38:21 +02:00
parent c645b906f3
commit 343de8b8ab
1 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/decoder/FLACMetaData.cxx
View File

@@ -243,45 +243,21 @@ bool
flac_scan_file2(const char *file, flac_scan_file2(const char *file,
const struct tag_handler *handler, void *handler_ctx) const struct tag_handler *handler, void *handler_ctx)
{ {
FLAC__Metadata_SimpleIterator *it; FLACMetadataChain chain;
FLAC__StreamMetadata *block = nullptr; if (!chain.Read(file)) {
g_debug("Failed to read FLAC tags: %s",
it = FLAC__metadata_simple_iterator_new(); chain.GetStatusString());
if (!FLAC__metadata_simple_iterator_init(it, file, 1, 0)) {
const char *err;
FLAC_API FLAC__Metadata_SimpleIteratorStatus s;
s = FLAC__metadata_simple_iterator_status(it);
switch (s) { /* slightly more human-friendly messages: */
case FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ILLEGAL_INPUT:
err = "illegal input";
break;
case FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ERROR_OPENING_FILE:
err = "error opening file";
break;
case FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_A_FLAC_FILE:
err = "not a FLAC file";
break;
default:
err = FLAC__Metadata_SimpleIteratorStatusString[s];
}
g_debug("Reading '%s' metadata gave the following error: %s\n",
file, err);
FLAC__metadata_simple_iterator_delete(it);
return false; return false;
} }
FLACMetadataIterator iterator(chain);
do { do {
block = FLAC__metadata_simple_iterator_get_block(it); FLAC__StreamMetadata *block = iterator.GetBlock();
if (!block) if (block == nullptr)
break; break;
flac_scan_metadata(block, handler, handler_ctx); flac_scan_metadata(block, handler, handler_ctx);
FLAC__metadata_object_delete(block); } while (iterator.Next());
} while (FLAC__metadata_simple_iterator_next(it));
FLAC__metadata_simple_iterator_delete(it);
return true; return true;
} }