FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests1 Actions Packages Projects Releases Wiki Activity

tag: id3v2: Never output a tag with a null contents string.

Browse Source 
Original commit message from CVS:
* gst-libs/gst/tag/id3v2frames.c: (parse_text_identification_frame),
(id3v2_tag_to_taglist), (id3v2_genre_string_to_taglist),
(id3v2_genre_fields_to_taglist):
Never output a tag with a null contents string.
This commit is contained in:
Jan Schmidt 2006-02-03 13:06:24 +00:00 committed by Tim-Philipp Müller
parent 78aa922244
commit 207f8e9f23
1 changed files with 15 additions and 3 deletions

16
gst-libs/gst/tag/id3v2frames.c

@ -232,6 +232,16 @@ parse_text_identification_frame (ID3TagsWorking * work)
encoding = work->parse_data[0]; encoding = work->parse_data[0];
parse_split_strings (encoding, (gchar *) work->parse_data + 1, parse_split_strings (encoding, (gchar *) work->parse_data + 1,
work->parse_size - 1, &fields); work->parse_size - 1, &fields);
if (fields) {
if (fields->len > 0) {
GST_LOG ("Read %d fields from Text ID frame of size %d. First is '%s'",
fields->len, work->parse_size - 1,
g_array_index (fields, gchar *, 0));
} else {
GST_LOG ("Read %d fields from Text ID frame of size %d", fields->len,
work->parse_size - 1);
}
}
return fields; return fields;
} }
@ -243,6 +253,9 @@ id3v2_tag_to_taglist (ID3TagsWorking * work, const gchar * tag_name,
GType tag_type = gst_tag_get_type (tag_name); GType tag_type = gst_tag_get_type (tag_name);
GstTagList *tag_list = work->tags; GstTagList *tag_list = work->tags;
if (tag_str == NULL)
return FALSE;
switch (tag_type) { switch (tag_type) {
case G_TYPE_UINT: case G_TYPE_UINT:
{ {
@ -371,7 +384,6 @@ id3v2_genre_string_to_taglist (ID3TagsWorking * work, const gchar * tag_name,
/* If it's a number, it might be a defined genre */ /* If it's a number, it might be a defined genre */
if (id3v2_are_digits (tag_str, len)) { if (id3v2_are_digits (tag_str, len)) {
tag_str = gst_tag_id3_genre_get (strtol (tag_str, NULL, 10)); tag_str = gst_tag_id3_genre_get (strtol (tag_str, NULL, 10));
if (tag_str != NULL)
return id3v2_tag_to_taglist (work, tag_name, tag_str); return id3v2_tag_to_taglist (work, tag_name, tag_str);
} }
/* Otherwise it might be "RX" or "CR" */ /* Otherwise it might be "RX" or "CR" */
@ -434,7 +446,7 @@ id3v2_genre_fields_to_taglist (ID3TagsWorking * work, const gchar * tag_name,
} }
} }
if (len > 0) if (len > 0 && tag_str != NULL)
result |= id3v2_genre_string_to_taglist (work, tag_name, tag_str, len); result |= id3v2_genre_string_to_taglist (work, tag_name, tag_str, len);
} }
return result; return result;