diff options
| author | Stefan Sauer <ensonic@users.sf.net> | 2014-01-06 22:15:24 +0100 |
|---|---|---|
| committer | Stefan Sauer <ensonic@users.sf.net> | 2014-01-06 22:17:15 +0100 |
| commit | c894c2d721a9bc96789c2163b8ffdd9791a3d565 (patch) | |
| tree | b95fd046aceb584679f878cd33a2fd40464c4cda /ext/sndfile | |
| parent | a59d2c481713dd194cbedb5a6853be1a8cd435c2 (diff) | |
| download | gstreamer-plugins-bad-c894c2d721a9bc96789c2163b8ffdd9791a3d565.tar.gz | |
sfdec: skip '\0' strings for metadata
libsndfile does not filter empty strings. We get a warning from gstreamer when
setting this as a tag.
Diffstat (limited to 'ext/sndfile')
| -rw-r--r-- | ext/sndfile/gstsfdec.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/sndfile/gstsfdec.c b/ext/sndfile/gstsfdec.c index 29302ccf3..b34a729d5 100644 --- a/ext/sndfile/gstsfdec.c +++ b/ext/sndfile/gstsfdec.c @@ -479,37 +479,37 @@ create_and_send_tags (GstSFDec * self, SF_INFO * info, SF_LOOP_INFO * loop_info, /* send tags */ tags = gst_tag_list_new_empty (); - if ((tag = sf_get_string (self->file, SF_STR_TITLE))) { + if ((tag = sf_get_string (self->file, SF_STR_TITLE)) && *tag) { gst_tag_list_add (tags, GST_TAG_MERGE_APPEND, GST_TAG_TITLE, tag, NULL); } - if ((tag = sf_get_string (self->file, SF_STR_COMMENT))) { + if ((tag = sf_get_string (self->file, SF_STR_COMMENT)) && *tag) { gst_tag_list_add (tags, GST_TAG_MERGE_APPEND, GST_TAG_COMMENT, tag, NULL); } - if ((tag = sf_get_string (self->file, SF_STR_ARTIST))) { + if ((tag = sf_get_string (self->file, SF_STR_ARTIST)) && *tag) { gst_tag_list_add (tags, GST_TAG_MERGE_APPEND, GST_TAG_ARTIST, tag, NULL); } - if ((tag = sf_get_string (self->file, SF_STR_ALBUM))) { + if ((tag = sf_get_string (self->file, SF_STR_ALBUM)) && *tag) { gst_tag_list_add (tags, GST_TAG_MERGE_APPEND, GST_TAG_ALBUM, tag, NULL); } - if ((tag = sf_get_string (self->file, SF_STR_GENRE))) { + if ((tag = sf_get_string (self->file, SF_STR_GENRE)) && *tag) { gst_tag_list_add (tags, GST_TAG_MERGE_APPEND, GST_TAG_GENRE, tag, NULL); } - if ((tag = sf_get_string (self->file, SF_STR_COPYRIGHT))) { + if ((tag = sf_get_string (self->file, SF_STR_COPYRIGHT)) && *tag) { gst_tag_list_add (tags, GST_TAG_MERGE_APPEND, GST_TAG_COPYRIGHT, tag, NULL); } - if ((tag = sf_get_string (self->file, SF_STR_LICENSE))) { + if ((tag = sf_get_string (self->file, SF_STR_LICENSE)) && *tag) { gst_tag_list_add (tags, GST_TAG_MERGE_APPEND, GST_TAG_LICENSE, tag, NULL); } - if ((tag = sf_get_string (self->file, SF_STR_SOFTWARE))) { + if ((tag = sf_get_string (self->file, SF_STR_SOFTWARE)) && *tag) { gst_tag_list_add (tags, GST_TAG_MERGE_APPEND, GST_TAG_APPLICATION_NAME, tag, NULL); } - if ((tag = sf_get_string (self->file, SF_STR_TRACKNUMBER))) { + if ((tag = sf_get_string (self->file, SF_STR_TRACKNUMBER)) && *tag) { guint track = atoi (tag); gst_tag_list_add (tags, GST_TAG_MERGE_REPLACE, GST_TAG_TRACK_NUMBER, track, NULL); } - if ((tag = sf_get_string (self->file, SF_STR_DATE))) { + if ((tag = sf_get_string (self->file, SF_STR_DATE)) && *tag) { GValue tag_val = { 0, }; GType tag_type = gst_tag_get_type (GST_TAG_DATE_TIME); |