From ce1f50ae1138b63d14b04e54fe53e360063cb6b4 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Mon, 1 Sep 2008 13:35:32 +0000 Subject: [PATCH] Add new tags for geo location and clarify purpose of existing location tag. Fixes #481169 Original commit message from CVS: * docs/gst/gstreamer-sections.txt: * gst/gsttaglist.c: * gst/gsttaglist.h: Add new tags for geo location and clarify purpose of existing location tag. Fixes #481169 --- ChangeLog | 8 ++++++ docs/gst/gstreamer-sections.txt | 4 +++ gst/gsttaglist.c | 37 +++++++++++++++++++-------- gst/gsttaglist.h | 45 ++++++++++++++++++++++++++++++++- 4 files changed, 83 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02a134260a..8859979260 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-09-01 Stefan Kost + + * docs/gst/gstreamer-sections.txt: + * gst/gsttaglist.c: + * gst/gsttaglist.h: + Add new tags for geo location and clarify purpose of existing location + tag. Fixes #481169 + 2008-09-01 Wim Taymans Patch by: Olivier Crete diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index 71cf495540..acbacf732f 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -2004,6 +2004,10 @@ GST_TAG_PREVIEW_IMAGE GST_TAG_ATTACHMENT GST_TAG_BEATS_PER_MINUTE GST_TAG_KEYWORDS +GST_TAG_GEO_LOCATION_NAME +GST_TAG_GEO_LOCATION_LATITUDE +GST_TAG_GEO_LOCATION_LONGITUDE +GST_TAG_GEO_LOCATION_ELEVATION gst_tag_register gst_tag_merge_use_first diff --git a/gst/gsttaglist.c b/gst/gsttaglist.c index a216e26126..cb65d7d1f1 100644 --- a/gst/gsttaglist.c +++ b/gst/gsttaglist.c @@ -153,18 +153,15 @@ _gst_tag_initialize (void) gst_tag_register (GST_TAG_LOCATION, GST_TAG_FLAG_META, G_TYPE_STRING, _("location"), - _("original location of file as a URI"), + _ + ("Origin of media as a URI (location, where the original of the file or stream is hosted)"), gst_tag_merge_strings_with_comma); - gst_tag_register (GST_TAG_DESCRIPTION, GST_TAG_FLAG_META, - G_TYPE_STRING, - _("description"), - _("short text describing the content of the data"), + gst_tag_register (GST_TAG_DESCRIPTION, GST_TAG_FLAG_META, G_TYPE_STRING, + _("description"), _("short text describing the content of the data"), gst_tag_merge_strings_with_comma); - gst_tag_register (GST_TAG_VERSION, GST_TAG_FLAG_META, - G_TYPE_STRING, _("version"), _("version of this data"), NULL); - gst_tag_register (GST_TAG_ISRC, GST_TAG_FLAG_META, - G_TYPE_STRING, - _("ISRC"), + gst_tag_register (GST_TAG_VERSION, GST_TAG_FLAG_META, G_TYPE_STRING, + _("version"), _("version of this data"), NULL); + gst_tag_register (GST_TAG_ISRC, GST_TAG_FLAG_META, G_TYPE_STRING, _("ISRC"), _ ("International Standard Recording Code - see http://www.ifpi.org/isrc/"), NULL); @@ -248,6 +245,26 @@ _gst_tag_initialize (void) gst_tag_register (GST_TAG_KEYWORDS, GST_TAG_FLAG_META, G_TYPE_STRING, _("keywords"), _("comma separated keywords describing the content"), gst_tag_merge_strings_with_comma); + gst_tag_register (GST_TAG_GEO_LOCATION_NAME, GST_TAG_FLAG_META, G_TYPE_STRING, + _("geo location name"), + _ + ("human readable descriptive location or where the media has been recorded or produced"), + NULL); + gst_tag_register (GST_TAG_GEO_LOCATION_LATITUDE, GST_TAG_FLAG_META, + G_TYPE_DOUBLE, _("geo location latitude"), + _ + ("geo latitude location of where the media has been recorded or produced in degrees according to WGS84 (zero at the equator, negative values for southern latitudes)"), + NULL); + gst_tag_register (GST_TAG_GEO_LOCATION_LONGITUDE, GST_TAG_FLAG_META, + G_TYPE_DOUBLE, _("geo location longitude"), + _ + ("geo longitude location of where the media has been recorded or produced in degrees according to WGS84 (zero at the prime meridian in Greenwich/UK, negative values for western longitudes)"), + NULL); + gst_tag_register (GST_TAG_GEO_LOCATION_ELEVATION, GST_TAG_FLAG_META, + G_TYPE_DOUBLE, _("geo location elevation"), + _ + ("geo elevation of where the media has been recorded or produced in meters according to WGS84 (zero is average sea level)"), + NULL); } /** diff --git a/gst/gsttaglist.h b/gst/gsttaglist.h index 41afea1e54..d1419e8fbb 100644 --- a/gst/gsttaglist.h +++ b/gst/gsttaglist.h @@ -464,7 +464,8 @@ gboolean gst_tag_list_get_date_index (const GstTagList * list, /** * GST_TAG_LOCATION: * - * original location of file as a URI (string) + * Origin of media as a URI (location, where the original of the file or stream + * is hosted) (string) */ #define GST_TAG_LOCATION "location" /** @@ -683,6 +684,48 @@ gboolean gst_tag_list_get_date_index (const GstTagList * list, */ #define GST_TAG_KEYWORDS "keywords" +/** + * GST_TAG_GEO_LOCATION_NAME: + * + * human readable descriptive location of where the media has been recorded or + * produced. (string). + * + * Since: 0.10.22 + */ +#define GST_TAG_GEO_LOCATION_NAME "geo-location-name" + +/** + * GST_TAG_GEO_LOCATION_LATITUDE: + * + * geo latitude location of where the media has been recorded or produced in + * degrees according to WGS84 (zero at the equator, negative values for southern + * latitudes) (double). + * + * Since: 0.10.22 + */ +#define GST_TAG_GEO_LOCATION_LATITUDE "geo-location-latitude" + +/** + * GST_TAG_GEO_LOCATION_LONGITUDE: + * + * geo longitude location of where the media has been recorded or produced in + * degrees according to WGS84 (zero at the prime meridian in Greenwich/UK, + * negative values for western longitudes). (double). + * + * Since: 0.10.22 + */ +#define GST_TAG_GEO_LOCATION_LONGITUDE "geo-location-longitude" + +/** + * GST_TAG_GEO_LOCATION_ELEVATION: + * + * geo elevation of where the media has been recorded or produced in meters + * according to WGS84 (zero is average sea level) (double). + * + * Since: 0.10.22 + */ +#define GST_TAG_GEO_LOCATION_ELEVATION "geo-location-altitude" + G_END_DECLS #endif /* __GST_TAGLIST_H__ */