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

flac: removed "vorbis_comment_found" flag

Browse Source 
Use tag_is_empty() instead.
This commit is contained in:
Max Kellermann 2009-01-15 19:53:07 +01:00
parent 86dc79293f
commit 8307dd3e87
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/decoder/flac_plugin.c
View File

@ -228,14 +228,12 @@ flac_write_cb(const flac_decoder *dec, const FLAC__Frame *frame,
}
static struct tag *
flac_tag_load(const char *file, bool *vorbis_comment_found)
flac_tag_load(const char *file)
{
struct tag *ret = NULL;
FLAC__Metadata_SimpleIterator *it;
FLAC__StreamMetadata *block = NULL;
*vorbis_comment_found = false;
it = FLAC__metadata_simple_iterator_new();
if (!FLAC__metadata_simple_iterator_init(it, file, 1, 0)) {
const char *err;
@ -267,10 +265,7 @@ flac_tag_load(const char *file, bool *vorbis_comment_found)
if (!block)
break;
if (block->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
ret = flac_vorbis_comments_to_tag(block, ret);
if (ret)
*vorbis_comment_found = true;
flac_vorbis_comments_to_tag(block, ret);
} else if (block->type == FLAC__METADATA_TYPE_STREAMINFO) {
if (!ret)
ret = tag_new();
@ -289,14 +284,13 @@ static struct tag *
flac_tag_dup(const char *file)
{
struct tag *ret = NULL;
bool vorbis_comment_found = false;
ret = flac_tag_load(file, &vorbis_comment_found);
ret = flac_tag_load(file);
if (!ret) {
g_debug("Failed to grab information from: %s\n", file);
return NULL;
}
if (!vorbis_comment_found) {
if (tag_is_empty(ret)) {
struct tag *temp = tag_id3_load(file);
if (temp) {
temp->time = ret->time;