Commit b5f7e326e66ce9518255fce105e4d7bf534a5de1

	* ext/gst-camerabin/gdigicam-camerabin.c:
	(_g_digicam_camerabin_set_picture_metadata),
	(_g_digicam_camerabin_set_video_metadata): Added support to
	metadata keywords.
	(_foreach_slist_add_keyword_tag): Added. Utility function to merge
	into a tag list the keywords included in a GSList.
	* ext/gst-camerabin/gdigicam-camerabin.h: Added a new member to
	the GDigicamCamerabinMetadata structure in order to store a list
	of keywords.
ChangeLog
(14 / 0)
  
12010-03-10 Andrés Gómez <agomez@igalia.com>
2
3 reviewed by: Antía Puentes <apuentes@igalia.com>
4
5 * ext/gst-camerabin/gdigicam-camerabin.c:
6 (_g_digicam_camerabin_set_picture_metadata),
7 (_g_digicam_camerabin_set_video_metadata): Added support to
8 metadata keywords.
9 (_foreach_slist_add_keyword_tag): Added. Utility function to merge
10 into a tag list the keywords included in a GSList.
11 * ext/gst-camerabin/gdigicam-camerabin.h: Added a new member to
12 the GDigicamCamerabinMetadata structure in order to store a list
13 of keywords.
14
1152010-02-10 Javier Fernández <jfernandez@igalia.com>
216
317 reviewed by: Andrés Gómez <agomez@igalia.com>
ext/gst-camerabin/gdigicam-camerabin.c
(29 / 0)
  
165165 gpointer user_data);
166166static gboolean _g_digicam_camerabin_handle_sync_bus_message (GDigicamManager *manager,
167167 gpointer user_data);
168static void _foreach_slist_add_keyword_tag (gchar *keyword, GstTagList *list);
168169
169170
170171/**************************************************/
……
21162116 }
21172117 }
21182118
2119 /* Adding keyword metadata tags. */
2120 if (NULL != metadata->keywords) {
2121 g_slist_foreach (metadata->keywords,
2122 (GFunc) _foreach_slist_add_keyword_tag,
2123 list);
2124 }
2125
21192126 /* Set metadata tags. */
21202127 gst_tag_setter_merge_tags (setter, list,
21212128 GST_TAG_MERGE_REPLACE_ALL);
……
22432243 NULL);
22442244 }
22452245
2246 /* Adding keyword metadata tags. */
2247 if (NULL != metadata->keywords) {
2248 g_slist_foreach (metadata->keywords,
2249 (GFunc) _foreach_slist_add_keyword_tag,
2250 list);
2251 }
2252
22462253 /* Set metadata tags. */
22472254 gst_tag_setter_merge_tags (setter, list,
22482255 GST_TAG_MERGE_REPLACE_ALL);
……
29542954
29552955 gst_object_unref (sender_elem);
29562956 g_object_unref (vsrc);
2957}
2958
2959
2960static void
2961_foreach_slist_add_keyword_tag (gchar *keyword, GstTagList *list)
2962{
2963 g_assert (NULL != keyword);
2964 g_assert (NULL != list);
2965
2966 gst_tag_list_add (list,
2967 GST_TAG_MERGE_APPEND,
2968 GST_TAG_KEYWORDS,
2969 keyword,
2970 NULL);
29572971}
ext/gst-camerabin/gdigicam-camerabin.h
(2 / 0)
  
5252 * @latitude: Geolocation's latitude parameter.
5353 * @altitude: Geolocation's altitude parameter.
5454 * @orientation: Content orientation.
55 * @keywords: Keywords.
5556 *
5657 * Data structure with metadata information to be used during the
5758 * capture operation.
……
6969 gdouble latitude;
7070 gdouble altitude;
7171 guint orientation;
72 GSList *keywords;
7273 } GDigicamCamerabinMetadata;
7374
7475 /*****************************************/