mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

tag: extract dates from ID3v2 tags into GstDateTime instead of GDate

Browse source 
We may only have a year, or year and month+day, or (in future)
both date and time.
This commit is contained in:
Tim-Philipp Müller 2012-07-14 15:37:46 +01:00
parent a1d1bd0517
commit 54e9581a59
3 changed files with 48 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/tag/gstid3tag.c
View file

@ -93,7 +93,7 @@ static const GstTagEntryMatch tag_matches[] = {
{GST_TAG_COPYRIGHT_URI, "WCOP"},
{GST_TAG_ENCODED_BY, "TENC"},
{GST_TAG_GENRE, "TCON"},
{GST_TAG_DATE, "TDRC"},
{GST_TAG_DATE_TIME, "TDRC"},
{GST_TAG_COMMENT, "COMM"},
{GST_TAG_ALBUM_VOLUME_NUMBER, "TPOS"},
{GST_TAG_DURATION, "TLEN"},

19
gst-libs/gst/tag/id3v2.c
View file

@ -598,15 +598,20 @@ id3v2_frames_to_tag_list (ID3TagsWorking * work, guint size)
}
/* Set day/month now if they were in a separate (obsolete) TDAT frame */
/* FIXME: we could extract the time as well now */
if (work->pending_day != 0 && work->pending_month != 0) {
GDate *date = NULL;
GstDateTime *dt = NULL;
if (gst_tag_list_get_date (work->tags, GST_TAG_DATE, &date)) {
g_date_set_day (date, work->pending_day);
g_date_set_month (date, work->pending_month);
gst_tag_list_add (work->tags, GST_TAG_MERGE_REPLACE, GST_TAG_DATE,
date, NULL);
g_date_free (date);
if (gst_tag_list_get_date_time (work->tags, GST_TAG_DATE_TIME, &dt)) {
GstDateTime *dt2;
/* GstDateTime is immutable, so create new one and replace old one */
dt2 = gst_date_time_new_ymd (gst_date_time_get_year (dt),
work->pending_day, work->pending_month);
gst_tag_list_add (work->tags, GST_TAG_MERGE_REPLACE, GST_TAG_DATE_TIME,
dt2, NULL);
gst_date_time_unref (dt2);
gst_date_time_unref (dt);
}
}

72
gst-libs/gst/tag/id3v2frames.c
View file

@ -781,46 +781,44 @@ id3v2_tag_to_taglist (ID3TagsWorking * work, const gchar * tag_name,
}
default:{
gchar *tmp = NULL;
GValue src = { 0, };
GValue dest = { 0, };
if (tag_type == GST_TYPE_DATE_TIME) {
GstDateTime *dt;
/* Ensure that any date string is complete */
if (tag_type == G_TYPE_DATE) {
guint year = 1901, month = 1, day = 1;
/* Dates can be yyyy-MM-dd, yyyy-MM or yyyy, but we need
* the first type */
if (sscanf (tag_str, "%04u-%02u-%02u", &year, &month, &day) == 0)
break;
tmp = g_strdup_printf ("%04u-%02u-%02u", year, month, day);
tag_str = tmp;
}
/* handles anything else */
g_value_init (&src, G_TYPE_STRING);
g_value_set_string (&src, (const gchar *) tag_str);
g_value_init (&dest, tag_type);
if (g_value_transform (&src, &dest)) {
gst_tag_list_add_values (tag_list, GST_TAG_MERGE_APPEND,
tag_name, &dest, NULL);
} else if (tag_type == G_TYPE_DOUBLE) {
/* replaygain tags in TXXX frames ... */
g_value_set_double (&dest, g_strtod (tag_str, NULL));
gst_tag_list_add_values (tag_list, GST_TAG_MERGE_KEEP,
tag_name, &dest, NULL);
GST_LOG ("Converted string '%s' to double %f", tag_str,
g_value_get_double (&dest));
/* Dates can be yyyy-MM-dd, yyyy-MM or yyyy */
dt = gst_date_time_new_from_iso8601_string (tag_str);
if (dt != NULL) {
gst_tag_list_add (tag_list, GST_TAG_MERGE_APPEND, tag_name, dt, NULL);
gst_date_time_unref (dt);
} else {
GST_WARNING ("Could not transform '%s' into date", tag_str);
}
} else {
GST_WARNING ("Failed to transform tag from string to type '%s'",
g_type_name (tag_type));
}
GValue src = { 0, };
GValue dest = { 0, };
g_value_unset (&src);
g_value_unset (&dest);
g_free (tmp);
/* handles anything else */
g_value_init (&src, G_TYPE_STRING);
g_value_set_string (&src, (const gchar *) tag_str);
g_value_init (&dest, tag_type);
if (g_value_transform (&src, &dest)) {
gst_tag_list_add_values (tag_list, GST_TAG_MERGE_APPEND,
tag_name, &dest, NULL);
} else if (tag_type == G_TYPE_DOUBLE) {
/* replaygain tags in TXXX frames ... */
g_value_set_double (&dest, g_strtod (tag_str, NULL));
gst_tag_list_add_values (tag_list, GST_TAG_MERGE_KEEP,
tag_name, &dest, NULL);
GST_LOG ("Converted string '%s' to double %f", tag_str,
g_value_get_double (&dest));
} else {
GST_WARNING ("Failed to transform tag from string '%s' to type '%s'",
tag_str, g_type_name (tag_type));
}
g_value_unset (&src);
g_value_unset (&dest);
}
break;
}
}