mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst_tag_list_free -> gst_tag_list_unref

Browse source
This commit is contained in:
Tim-Philipp Müller 2012-06-02 16:38:35 +01:00
parent 52adcbf3be
commit 1f8e6b4fa5
5 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/gstmessage.c
View file

@ -1008,7 +1008,7 @@ gst_message_has_name (GstMessage * message, const gchar * name)
* gst_message_parse_tag (msg, &tags);
* g_print ("Got tags from element %s\n", GST_OBJECT_NAME (msg->src));
* handle_tags (tags);
* gst_tag_list_free (tags);
* gst_tag_list_unref (tags);
* break;
* }
* ...

2
tests/check/gst/gstmessage.c
View file

@ -113,7 +113,7 @@ GST_START_TEST (test_parsing)
fail_if (tag == NULL);
/* FIXME, check the actual tags */
gst_message_unref (message);
gst_tag_list_free (tag);
gst_tag_list_unref (tag);
}
/* GST_MESSAGE_BUFFERING */
{

58
tests/check/gst/gsttag.c
View file

@ -66,7 +66,7 @@ check_tags_empty (const GstTagList * list)
#define NEW_LIST_FIXED(mode) \
G_STMT_START { \
if (list) gst_tag_list_free (list); \
if (list) gst_tag_list_unref (list); \
list = gst_tag_list_new_empty (); \
gst_tag_list_add (list, mode, FTAG, FIXED1, FTAG, FIXED2, \
FTAG, FIXED3, FTAG, FIXED4, NULL); \
@ -75,7 +75,7 @@ G_STMT_START { \
#define NEW_LIST_UNFIXED(mode) \
G_STMT_START { \
if (list) gst_tag_list_free (list); \
if (list) gst_tag_list_unref (list); \
list = gst_tag_list_new_empty (); \
gst_tag_list_add (list, mode, UTAG, UNFIXED1, UTAG, UNFIXED2, \
UTAG, UNFIXED3, UTAG, UNFIXED4, NULL); \
@ -84,56 +84,56 @@ G_STMT_START { \
#define NEW_LISTS_FIXED(mode) \
G_STMT_START { \
if (list) gst_tag_list_free (list); \
if (list) gst_tag_list_unref (list); \
list = gst_tag_list_new_empty (); \
gst_tag_list_add (list, GST_TAG_MERGE_APPEND, FTAG, FIXED1, \
FTAG, FIXED2, NULL); \
if (list2) gst_tag_list_free (list2); \
if (list2) gst_tag_list_unref (list2); \
list2 = gst_tag_list_new_empty (); \
gst_tag_list_add (list2, GST_TAG_MERGE_APPEND, FTAG, FIXED3, \
FTAG, FIXED4, NULL); \
if (merge) gst_tag_list_free (merge); \
if (merge) gst_tag_list_unref (merge); \
merge = gst_tag_list_merge (list, list2, mode); \
mark_point(); \
} G_STMT_END;
#define NEW_LISTS_UNFIXED(mode) \
G_STMT_START { \
if (list) gst_tag_list_free (list); \
if (list) gst_tag_list_unref (list); \
list = gst_tag_list_new_empty (); \
gst_tag_list_add (list, GST_TAG_MERGE_APPEND, UTAG, UNFIXED1, \
UTAG, UNFIXED2, NULL); \
if (list2) gst_tag_list_free (list2); \
if (list2) gst_tag_list_unref (list2); \
list2 = gst_tag_list_new_empty (); \
gst_tag_list_add (list2, GST_TAG_MERGE_APPEND, UTAG, UNFIXED3,\
UTAG, UNFIXED4, NULL); \
if (merge) gst_tag_list_free (merge); \
if (merge) gst_tag_list_unref (merge); \
merge = gst_tag_list_merge (list, list2, mode); \
mark_point(); \
} G_STMT_END;
#define NEW_LISTS_EMPTY1(mode) \
G_STMT_START { \
if (list) gst_tag_list_free (list); \
if (list) gst_tag_list_unref (list); \
list = NULL; \
if (list2) gst_tag_list_free (list2); \
if (list2) gst_tag_list_unref (list2); \
list2 = gst_tag_list_new_empty (); \
gst_tag_list_add (list2, GST_TAG_MERGE_APPEND, FTAG, FIXED3, \
FTAG, FIXED4, NULL); \
if (merge) gst_tag_list_free (merge); \
if (merge) gst_tag_list_unref (merge); \
merge = gst_tag_list_merge (list, list2, mode); \
mark_point(); \
} G_STMT_END;
#define NEW_LISTS_EMPTY2(mode) \
G_STMT_START { \
if (list) gst_tag_list_free (list); \
if (list) gst_tag_list_unref (list); \
list = gst_tag_list_new_empty (); \
gst_tag_list_add (list, GST_TAG_MERGE_APPEND, FTAG, FIXED1, \
FTAG, FIXED2, NULL); \
if (list2) gst_tag_list_free (list2); \
if (list2) gst_tag_list_unref (list2); \
list2 = NULL; \
if (merge) gst_tag_list_free (merge); \
if (merge) gst_tag_list_unref (merge); \
merge = gst_tag_list_merge (list, list2, mode); \
mark_point(); \
} G_STMT_END;
@ -185,7 +185,7 @@ GST_START_TEST (test_add)
/* clean up */
if (list)
gst_tag_list_free (list);
gst_tag_list_unref (list);
}
GST_END_TEST
@ -256,11 +256,11 @@ GST_START_TEST (test_merge)
/* clean up */
if (list)
gst_tag_list_free (list);
gst_tag_list_unref (list);
if (list2)
gst_tag_list_free (list2);
gst_tag_list_unref (list2);
if (merge)
gst_tag_list_free (merge);
gst_tag_list_unref (merge);
}
GST_END_TEST
@ -282,7 +282,7 @@ GST_START_TEST (test_date_tags)
fail_if (tag_list2 == NULL);
fail_if (!gst_tag_list_get_date (tag_list2, GST_TAG_DATE, &date2));
fail_unless (gst_tag_list_is_equal (tag_list2, tag_list));
gst_tag_list_free (tag_list2);
gst_tag_list_unref (tag_list2);
g_free (str);
fail_if (g_date_compare (date, date2) != 0);
@ -294,7 +294,7 @@ GST_START_TEST (test_date_tags)
fail_if (g_date_get_year (date2) != 2005);
g_date_free (date2);
gst_tag_list_free (tag_list);
gst_tag_list_unref (tag_list);
g_date_free (date);
}
@ -306,7 +306,7 @@ GST_START_TEST (test_type)
taglist = gst_tag_list_new_empty ();
fail_unless (GST_IS_TAG_LIST (taglist));
gst_tag_list_free (taglist);
gst_tag_list_unref (taglist);
/* this should be fine */
fail_if (GST_IS_TAG_LIST (NULL));
@ -317,7 +317,7 @@ GST_START_TEST (test_type)
fail_unless (gst_tag_list_is_empty (taglist));
gst_tag_list_add (taglist, GST_TAG_MERGE_APPEND, GST_TAG_ARTIST, "JD", NULL);
fail_if (gst_tag_list_is_empty (taglist));
gst_tag_list_free (taglist);
gst_tag_list_unref (taglist);
}
GST_END_TEST;
@ -336,7 +336,7 @@ GST_START_TEST (test_set_non_utf8_string)
/* That string field with a non-UTF8 string should not have been added */
fail_unless (gst_tag_list_is_empty (taglist));
gst_tag_list_free (taglist);
gst_tag_list_unref (taglist);
}
GST_END_TEST;
@ -376,7 +376,7 @@ GST_START_TEST (test_buffer_tags)
gst_buffer_unref (buf1);
gst_buffer_unref (buf2);
gst_tag_list_free (tags);
gst_tag_list_unref (tags);
}
GST_END_TEST;
@ -395,7 +395,7 @@ GST_START_TEST (test_empty_tags)
ASSERT_WARNING (gst_tag_list_add (tags, GST_TAG_MERGE_APPEND,
GST_TAG_ARTIST, "", NULL));
gst_tag_list_add (tags, GST_TAG_MERGE_APPEND, GST_TAG_ARTIST, "xyz", NULL);
gst_tag_list_free (tags);
gst_tag_list_unref (tags);
}
GST_END_TEST;
@ -421,7 +421,7 @@ GST_START_TEST (test_new_full)
fail_unless_equals_float (track_gain, 4.242);
fail_unless (tags != NULL);
gst_tag_list_free (tags);
gst_tag_list_unref (tags);
g_free (artist);
g_free (title);
}
@ -444,7 +444,7 @@ GST_START_TEST (test_merge_strings_with_comma)
fail_unless (strstr (artists, "Bar") != NULL);
fail_unless (strstr (artists, "Yay") != NULL);
g_free (artists);
gst_tag_list_free (tags);
gst_tag_list_unref (tags);
}
GST_END_TEST;
@ -480,8 +480,8 @@ GST_START_TEST (test_equal)
9.87654310, NULL);
fail_unless (!gst_tag_list_is_equal (tags2, tags));
gst_tag_list_free (tags);
gst_tag_list_free (tags2);
gst_tag_list_unref (tags);
gst_tag_list_unref (tags2);
}
GST_END_TEST;

16
tests/check/gst/gsttagsetter.c
View file

@ -112,8 +112,8 @@ GST_START_TEST (test_merge)
NULL);
assert_tag_setter_list_length (setter, 2);
gst_tag_list_free (list2);
gst_tag_list_free (list1);
gst_tag_list_unref (list2);
gst_tag_list_unref (list1);
g_object_unref (enc);
}
@ -160,9 +160,9 @@ GST_START_TEST (test_merge_modes)
fail_unless_equals_int (tag_list_length (gst_tag_setter_get_tag_list
(setter)), tag_list_length (merged));
gst_tag_list_free (list1);
gst_tag_list_free (list2);
gst_tag_list_free (merged);
gst_tag_list_unref (list1);
gst_tag_list_unref (list2);
gst_tag_list_unref (merged);
gst_object_unref (enc);
}
}
@ -200,9 +200,9 @@ GST_START_TEST (test_merge_modes_skip_empty)
fail_unless_equals_int (tag_list_length (gst_tag_setter_get_tag_list
(setter)), tag_list_length (merged));
gst_tag_list_free (list1);
gst_tag_list_free (list2);
gst_tag_list_free (merged);
gst_tag_list_unref (list1);
gst_tag_list_unref (list2);
gst_tag_list_unref (merged);
gst_object_unref (enc);
}
}

4
tests/examples/metadata/read-metadata.c
View file

@ -69,7 +69,7 @@ message_loop (GstElement * element, GstTagList ** tags)
if (*tags) {
old_tags = *tags;
*tags = gst_tag_list_merge (old_tags, new_tags, GST_TAG_MERGE_KEEP);
gst_tag_list_free (old_tags);
gst_tag_list_unref (old_tags);
} else
*tags = new_tags;
break;
@ -178,7 +178,7 @@ main (int argc, char *argv[])
if (tags) {
g_print ("Metadata for %s:\n", argv[i]);
gst_tag_list_foreach (tags, print_tag, NULL);
gst_tag_list_free (tags);
gst_tag_list_unref (tags);
tags = NULL;
} else
g_print ("No metadata found for %s\n", argv[i]);