From c629a441629dda6c56fdcfdc1463ce4d282506c3 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Fri, 14 Sep 2012 17:53:21 +0200 Subject: [PATCH] replace gst_tag_list_free with gst_tag_list_unref --- ext/ogg/gstoggdemux.c | 4 +- ext/ogg/gstoggmux.c | 4 +- ext/ogg/gstoggstream.c | 4 +- ext/vorbis/gstvorbisdec.c | 2 +- ext/vorbis/gstvorbisenc.c | 4 +- ext/vorbis/gstvorbistag.c | 4 +- gst-libs/gst/audio/gstaudiocdsrc.c | 4 +- gst-libs/gst/audio/gstaudiodecoder.c | 2 +- gst-libs/gst/audio/gstaudioencoder.c | 4 +- gst-libs/gst/pbutils/gstdiscoverer-types.c | 4 +- gst-libs/gst/pbutils/gstdiscoverer.c | 14 +++--- gst-libs/gst/riff/riff-read.c | 2 +- gst-libs/gst/tag/gstexiftag.c | 2 +- gst-libs/gst/tag/gsttagdemux.c | 12 ++--- gst-libs/gst/tag/gsttagmux.c | 6 +-- gst-libs/gst/tag/gstvorbistag.c | 2 +- gst-libs/gst/tag/id3v2.c | 2 +- gst/audiotestsrc/gstaudiotestsrc.c | 2 +- tests/check/elements/vorbisdec.c | 2 +- tests/check/elements/vorbistag.c | 6 +-- tests/check/libs/audiocdsrc.c | 2 +- tests/check/libs/pbutils.c | 2 +- tests/check/libs/tag.c | 70 +++++++++++++++--------------- tests/check/libs/xmpwriter.c | 10 ++--- 24 files changed, 85 insertions(+), 85 deletions(-) diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index fb52ca4..fdf6017 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -224,7 +224,7 @@ gst_ogg_pad_dispose (GObject * object) } if (pad->map.taglist) { - gst_tag_list_free (pad->map.taglist); + gst_tag_list_unref (pad->map.taglist); pad->map.taglist = NULL; } @@ -1892,7 +1892,7 @@ gst_ogg_chain_new_stream (GstOggChain * chain, guint32 serialno) list = gst_tag_list_new_empty (); gst_tag_list_add (list, GST_TAG_MERGE_REPLACE, GST_TAG_SERIAL, serialno, NULL); - gst_tag_list_free (list); + gst_tag_list_unref (list); GST_DEBUG_OBJECT (chain->ogg, "created new ogg src %p for stream with serial %08x", ret, serialno); diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c index fd8e67c..01c1ce5 100644 --- a/ext/ogg/gstoggmux.c +++ b/ext/ogg/gstoggmux.c @@ -330,7 +330,7 @@ gst_ogg_mux_sink_event (GstCollectPads * pads, GstCollectData * pad, gst_event_parse_tag (event, &tags); tags = gst_tag_list_merge (ogg_pad->tags, tags, GST_TAG_MERGE_APPEND); if (ogg_pad->tags) - gst_tag_list_free (ogg_pad->tags); + gst_tag_list_unref (ogg_pad->tags); ogg_pad->tags = tags; GST_DEBUG_OBJECT (ogg_mux, "Got tags %" GST_PTR_FORMAT, ogg_pad->tags); @@ -2061,7 +2061,7 @@ gst_ogg_mux_clear_collectpads (GstCollectPads * collect) } if (oggpad->tags) { - gst_tag_list_free (oggpad->tags); + gst_tag_list_unref (oggpad->tags); oggpad->tags = NULL; } diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c index 297155d..c79f088 100644 --- a/ext/ogg/gstoggstream.c +++ b/ext/ogg/gstoggstream.c @@ -372,7 +372,7 @@ tag_list_from_vorbiscomment_packet (ogg_packet * packet, exit: if (*tags) - gst_tag_list_free (*tags); + gst_tag_list_unref (*tags); *tags = list; return ret; @@ -1856,7 +1856,7 @@ extract_tags_kate (GstOggStream * pad, ogg_packet * packet) /* ensure the comment packet cannot override the category/language from the identification header */ gst_tag_list_insert (pad->taglist, list, GST_TAG_MERGE_KEEP_ALL); - gst_tag_list_free (list); + gst_tag_list_unref (list); } else pad->taglist = list; } diff --git a/ext/vorbis/gstvorbisdec.c b/ext/vorbis/gstvorbisdec.c index b19aafa..7cdf623 100644 --- a/ext/vorbis/gstvorbisdec.c +++ b/ext/vorbis/gstvorbisdec.c @@ -257,7 +257,7 @@ vorbis_handle_comment_packet (GstVorbisDec * vd, ogg_packet * packet) gst_audio_decoder_merge_tags (GST_AUDIO_DECODER_CAST (vd), list, GST_TAG_MERGE_REPLACE); - gst_tag_list_free (list); + gst_tag_list_unref (list); return GST_FLOW_OK; } diff --git a/ext/vorbis/gstvorbisenc.c b/ext/vorbis/gstvorbisenc.c index b6ef1be..f30afb8 100644 --- a/ext/vorbis/gstvorbisenc.c +++ b/ext/vorbis/gstvorbisenc.c @@ -241,7 +241,7 @@ gst_vorbis_enc_stop (GstAudioEncoder * enc) vorbis_info_clear (&vorbisenc->vi); g_free (vorbisenc->last_message); vorbisenc->last_message = NULL; - gst_tag_list_free (vorbisenc->tags); + gst_tag_list_unref (vorbisenc->tags); vorbisenc->tags = NULL; gst_tag_setter_reset_tags (GST_TAG_SETTER (enc)); @@ -386,7 +386,7 @@ gst_vorbis_enc_set_metadata (GstVorbisEnc * enc) if (merged_tags) { GST_DEBUG_OBJECT (enc, "merged tags = %" GST_PTR_FORMAT, merged_tags); gst_tag_list_foreach (merged_tags, gst_vorbis_enc_metadata_set1, enc); - gst_tag_list_free (merged_tags); + gst_tag_list_unref (merged_tags); } } diff --git a/ext/vorbis/gstvorbistag.c b/ext/vorbis/gstvorbistag.c index b60c665..b2cf561 100644 --- a/ext/vorbis/gstvorbistag.c +++ b/ext/vorbis/gstvorbistag.c @@ -118,14 +118,14 @@ gst_vorbis_tag_parse_packet (GstVorbisParse * parse, GstBuffer * buffer) /* build new tag list */ new_tags = gst_tag_list_merge (user_tags, old_tags, gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (tagger))); - gst_tag_list_free (old_tags); + gst_tag_list_unref (old_tags); new_buf = gst_tag_list_to_vorbiscomment_buffer (new_tags, (guint8 *) "\003vorbis", 7, encoder); gst_buffer_copy_into (new_buf, buffer, GST_BUFFER_COPY_TIMESTAMPS, 0, -1); - gst_tag_list_free (new_tags); + gst_tag_list_unref (new_tags); g_free (encoder); gst_buffer_unref (buffer); diff --git a/gst-libs/gst/audio/gstaudiocdsrc.c b/gst-libs/gst/audio/gstaudiocdsrc.c index 1b6aa6c..350dadf 100644 --- a/gst-libs/gst/audio/gstaudiocdsrc.c +++ b/gst-libs/gst/audio/gstaudiocdsrc.c @@ -1644,7 +1644,7 @@ gst_audio_cd_src_clear_tracks (GstAudioCdSrc * src) for (i = 0; i < src->priv->num_all_tracks; ++i) { if (src->priv->tracks[i].tags) - gst_tag_list_free (src->priv->tracks[i].tags); + gst_tag_list_unref (src->priv->tracks[i].tags); } g_free (src->priv->tracks); @@ -1667,7 +1667,7 @@ gst_audio_cd_src_stop (GstBaseSrc * basesrc) gst_audio_cd_src_clear_tracks (src); if (src->tags) { - gst_tag_list_free (src->tags); + gst_tag_list_unref (src->tags); src->tags = NULL; } diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c index 003ec8c..93ee163 100644 --- a/gst-libs/gst/audio/gstaudiodecoder.c +++ b/gst-libs/gst/audio/gstaudiodecoder.c @@ -475,7 +475,7 @@ gst_audio_decoder_reset (GstAudioDecoder * dec, gboolean full) dec->priv->ctx.max_errors = GST_AUDIO_DECODER_MAX_ERRORS; if (dec->priv->taglist) { - gst_tag_list_free (dec->priv->taglist); + gst_tag_list_unref (dec->priv->taglist); dec->priv->taglist = NULL; } dec->priv->taglist_changed = FALSE; diff --git a/gst-libs/gst/audio/gstaudioencoder.c b/gst-libs/gst/audio/gstaudioencoder.c index 1513554..99b5ca6 100644 --- a/gst-libs/gst/audio/gstaudioencoder.c +++ b/gst-libs/gst/audio/gstaudioencoder.c @@ -466,7 +466,7 @@ gst_audio_encoder_reset (GstAudioEncoder * enc, gboolean full) gst_audio_info_init (&enc->priv->ctx.info); if (enc->priv->tags) - gst_tag_list_free (enc->priv->tags); + gst_tag_list_unref (enc->priv->tags); enc->priv->tags = NULL; enc->priv->tags_changed = FALSE; @@ -1967,7 +1967,7 @@ gst_audio_encoder_activate (GstAudioEncoder * enc, gboolean active) if (active) { if (enc->priv->tags) - gst_tag_list_free (enc->priv->tags); + gst_tag_list_unref (enc->priv->tags); enc->priv->tags = gst_tag_list_new_empty (); enc->priv->tags_changed = FALSE; diff --git a/gst-libs/gst/pbutils/gstdiscoverer-types.c b/gst-libs/gst/pbutils/gstdiscoverer-types.c index b64d872..eb7651e 100644 --- a/gst-libs/gst/pbutils/gstdiscoverer-types.c +++ b/gst-libs/gst/pbutils/gstdiscoverer-types.c @@ -65,7 +65,7 @@ gst_discoverer_stream_info_finalize (GObject * object) gst_caps_unref (info->caps); if (info->tags) - gst_tag_list_free (info->tags); + gst_tag_list_unref (info->tags); if (info->toc) gst_toc_unref (info->toc); @@ -366,7 +366,7 @@ gst_discoverer_info_finalize (GObject * object) g_list_free (info->stream_list); if (info->tags) - gst_tag_list_free (info->tags); + gst_tag_list_unref (info->tags); if (info->toc) gst_toc_unref (info->toc); diff --git a/gst-libs/gst/pbutils/gstdiscoverer.c b/gst-libs/gst/pbutils/gstdiscoverer.c index 1bf5db8..7900048 100644 --- a/gst-libs/gst/pbutils/gstdiscoverer.c +++ b/gst-libs/gst/pbutils/gstdiscoverer.c @@ -478,7 +478,7 @@ _event_probe (GstPad * pad, GstPadProbeInfo * info, PrivateStream * ps) ps->tags); tmp = gst_tag_list_merge (ps->tags, tl, GST_TAG_MERGE_APPEND); if (ps->tags) - gst_tag_list_free (ps->tags); + gst_tag_list_unref (ps->tags); ps->tags = tmp; GST_DEBUG_OBJECT (pad, "private stream %p new tags %" GST_PTR_FORMAT, ps, tmp); @@ -680,7 +680,7 @@ uridecodebin_pad_removed_cb (GstElement * uridecodebin, GstPad * pad, gst_bin_remove_many (dc->priv->pipeline, ps->sink, ps->queue, NULL); if (ps->tags) { - gst_tag_list_free (ps->tags); + gst_tag_list_unref (ps->tags); } if (ps->toc) { gst_toc_unref (ps->toc); @@ -737,7 +737,7 @@ gst_discoverer_merge_and_replace_tags (GstTagList ** taglist, } gst_tag_list_insert (*taglist, new_tags, GST_TAG_MERGE_REPLACE); - gst_tag_list_free (new_tags); + gst_tag_list_unref (new_tags); } /* Parses a set of caps and tags in st and populates a GstDiscovererStreamInfo @@ -1112,9 +1112,9 @@ parse_stream_topology (GstDiscoverer * dc, const GstStructure * topology, tmp = gst_tag_list_merge (cont->parent.tags, (GstTagList *) tags, GST_TAG_MERGE_APPEND); - gst_tag_list_free (tags); + gst_tag_list_unref (tags); if (cont->parent.tags) - gst_tag_list_free (cont->parent.tags); + gst_tag_list_unref (cont->parent.tags); cont->parent.tags = tmp; GST_DEBUG ("Container info tags %" GST_PTR_FORMAT, tmp); } @@ -1376,9 +1376,9 @@ handle_message (GstDiscoverer * dc, GstMessage * msg) tmp = gst_tag_list_merge (dc->priv->current_info->tags, tl, GST_TAG_MERGE_APPEND); - gst_tag_list_free (tl); + gst_tag_list_unref (tl); if (dc->priv->current_info->tags) - gst_tag_list_free (dc->priv->current_info->tags); + gst_tag_list_unref (dc->priv->current_info->tags); dc->priv->current_info->tags = tmp; GST_DEBUG_OBJECT (GST_MESSAGE_SRC (msg), "Current info %p, tags %" GST_PTR_FORMAT, dc->priv->current_info, tmp); diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c index 8b96e6e..511cb01 100644 --- a/gst-libs/gst/riff/riff-read.c +++ b/gst-libs/gst/riff/riff-read.c @@ -811,7 +811,7 @@ gst_riff_parse_info (GstElement * element, *_taglist = taglist; } else { *_taglist = NULL; - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); } gst_buffer_unmap (buf, &info); diff --git a/gst-libs/gst/tag/gstexiftag.c b/gst-libs/gst/tag/gstexiftag.c index e55add4..9830e21 100644 --- a/gst-libs/gst/tag/gstexiftag.c +++ b/gst-libs/gst/tag/gstexiftag.c @@ -515,7 +515,7 @@ gst_exif_reader_reset (GstExifReader * reader, gboolean return_taglist) } if (reader->taglist) { - gst_tag_list_free (reader->taglist); + gst_tag_list_unref (reader->taglist); } return ret; diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c index 14b8447..565d7a2 100644 --- a/gst-libs/gst/tag/gsttagdemux.c +++ b/gst-libs/gst/tag/gsttagdemux.c @@ -267,11 +267,11 @@ gst_tag_demux_reset (GstTagDemux * tagdemux) gst_caps_replace (caps_p, NULL); if (tagdemux->priv->event_tags) { - gst_tag_list_free (tagdemux->priv->event_tags); + gst_tag_list_unref (tagdemux->priv->event_tags); tagdemux->priv->event_tags = NULL; } if (tagdemux->priv->parsed_tags) { - gst_tag_list_free (tagdemux->priv->parsed_tags); + gst_tag_list_unref (tagdemux->priv->parsed_tags); tagdemux->priv->parsed_tags = NULL; } @@ -967,7 +967,7 @@ gst_tag_demux_pull_end_tag (GstTagDemux * demux, GstTagList ** tags) done: if (new_tags) - gst_tag_list_free (new_tags); + gst_tag_list_unref (new_tags); if (buffer) gst_buffer_unref (buffer); return res; @@ -1089,7 +1089,7 @@ gst_tag_demux_pull_start_tag (GstTagDemux * demux, GstTagList ** tags) done: if (new_tags) - gst_tag_list_free (new_tags); + gst_tag_list_unref (new_tags); if (buffer) gst_buffer_unref (buffer); return res; @@ -1138,9 +1138,9 @@ gst_tag_demux_element_find (GstTagDemux * demux) } if (start_tags) - gst_tag_list_free (start_tags); + gst_tag_list_unref (start_tags); if (end_tags) - gst_tag_list_free (end_tags); + gst_tag_list_unref (end_tags); if (!e_tag_ok && !s_tag_ok) goto no_tags; diff --git a/gst-libs/gst/tag/gsttagmux.c b/gst-libs/gst/tag/gsttagmux.c index 10c9bd2..7fe9fbd 100644 --- a/gst-libs/gst/tag/gsttagmux.c +++ b/gst-libs/gst/tag/gsttagmux.c @@ -125,12 +125,12 @@ gst_tag_mux_finalize (GObject * obj) } if (mux->priv->event_tags) { - gst_tag_list_free (mux->priv->event_tags); + gst_tag_list_unref (mux->priv->event_tags); mux->priv->event_tags = NULL; } if (mux->priv->final_tags) { - gst_tag_list_free (mux->priv->final_tags); + gst_tag_list_unref (mux->priv->final_tags); mux->priv->final_tags = NULL; } @@ -538,7 +538,7 @@ gst_tag_mux_change_state (GstElement * element, GstStateChange transition) mux->priv->newsegment_ev = NULL; } if (mux->priv->event_tags) { - gst_tag_list_free (mux->priv->event_tags); + gst_tag_list_unref (mux->priv->event_tags); mux->priv->event_tags = NULL; } mux->priv->start_tag_size = 0; diff --git a/gst-libs/gst/tag/gstvorbistag.c b/gst-libs/gst/tag/gstvorbistag.c index d45a219..cffa2b8 100644 --- a/gst-libs/gst/tag/gstvorbistag.c +++ b/gst-libs/gst/tag/gstvorbistag.c @@ -487,7 +487,7 @@ gst_tag_list_from_vorbiscomment (const guint8 * data, gsize size, return list; error: - gst_tag_list_free (list); + gst_tag_list_unref (list); return NULL; #undef ADVANCE } diff --git a/gst-libs/gst/tag/id3v2.c b/gst-libs/gst/tag/id3v2.c index b353646..8c2c32f 100644 --- a/gst-libs/gst/tag/id3v2.c +++ b/gst-libs/gst/tag/id3v2.c @@ -592,7 +592,7 @@ id3v2_frames_to_tag_list (ID3TagsWorking * work, guint size) if (gst_tag_list_n_tags (work->tags) == 0) { GST_DEBUG ("Could not extract any frames from tag. Broken or empty tag"); - gst_tag_list_free (work->tags); + gst_tag_list_unref (work->tags); work->tags = NULL; return FALSE; } diff --git a/gst/audiotestsrc/gstaudiotestsrc.c b/gst/audiotestsrc/gstaudiotestsrc.c index ae9ca10..f6d5f67 100644 --- a/gst/audiotestsrc/gstaudiotestsrc.c +++ b/gst/audiotestsrc/gstaudiotestsrc.c @@ -1133,7 +1133,7 @@ gst_audio_test_src_fill (GstBaseSrc * basesrc, guint64 offset, eclass->send_event (GST_ELEMENT_CAST (basesrc), gst_event_new_tag (taglist)); else - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); src->tags_pushed = TRUE; } diff --git a/tests/check/elements/vorbisdec.c b/tests/check/elements/vorbisdec.c index 929f769..aec76f6 100644 --- a/tests/check/elements/vorbisdec.c +++ b/tests/check/elements/vorbisdec.c @@ -145,7 +145,7 @@ GST_START_TEST (test_identification_header) fail_unless_equals_string (artist, "me"); g_free (artist); fail_unless_equals_int (gst_tag_list_get_tag_size (tag_list, "album"), 0); - gst_tag_list_free (tag_list); + gst_tag_list_unref (tag_list); gst_message_unref (message); #endif diff --git a/tests/check/elements/vorbistag.c b/tests/check/elements/vorbistag.c index eb1a3dc..037c609 100644 --- a/tests/check/elements/vorbistag.c +++ b/tests/check/elements/vorbistag.c @@ -242,7 +242,7 @@ GST_START_TEST (test_empty_tags_set) GST_TAG_MERGE_REPLACE); gst_tag_setter_set_tag_merge_mode (GST_TAG_SETTER (vorbistag), GST_TAG_MERGE_KEEP_ALL); - gst_tag_list_free (tags); + gst_tag_list_unref (tags); start_pipeline (vorbistag); @@ -297,7 +297,7 @@ GST_START_TEST (test_filled_tags_unset) GST_TAG_MERGE_REPLACE); gst_tag_setter_set_tag_merge_mode (GST_TAG_SETTER (vorbistag), GST_TAG_MERGE_KEEP_ALL); - gst_tag_list_free (tags); + gst_tag_list_unref (tags); start_pipeline (vorbistag); @@ -353,7 +353,7 @@ GST_START_TEST (test_filled_tags_change) GST_TAG_MERGE_REPLACE); gst_tag_setter_set_tag_merge_mode (GST_TAG_SETTER (vorbistag), GST_TAG_MERGE_KEEP_ALL); - gst_tag_list_free (tags); + gst_tag_list_unref (tags); start_pipeline (vorbistag); diff --git a/tests/check/libs/audiocdsrc.c b/tests/check/libs/audiocdsrc.c index b135eeb..d726d27 100644 --- a/tests/check/libs/audiocdsrc.c +++ b/tests/check/libs/audiocdsrc.c @@ -345,7 +345,7 @@ GST_START_TEST (test_discid_calculations) fail_unless (tag_list_has_tag (tags, "musicbrainz-discid", G_TYPE_STRING)); fail_unless (tag_list_has_tag (tags, "musicbrainz-discid-full", G_TYPE_STRING)); - gst_tag_list_free (tags); + gst_tag_list_unref (tags); gst_message_unref (msg); msg = diff --git a/tests/check/libs/pbutils.c b/tests/check/libs/pbutils.c index 3de0efe..0460f18 100644 --- a/tests/check/libs/pbutils.c +++ b/tests/check/libs/pbutils.c @@ -447,7 +447,7 @@ GST_START_TEST (test_pb_utils_taglist_add_codec_info) fail_unless (gst_pb_utils_add_codec_description_to_tag_list (list, GST_TAG_VIDEO_CODEC, caps)); fail_if (gst_tag_list_is_empty (list)); - gst_tag_list_free (list); + gst_tag_list_unref (list); gst_caps_unref (caps); } diff --git a/tests/check/libs/tag.c b/tests/check/libs/tag.c index edd6edf..e2c411d 100644 --- a/tests/check/libs/tag.c +++ b/tests/check/libs/tag.c @@ -204,7 +204,7 @@ GST_START_TEST (test_musicbrainz_tag_registration) ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_MUSICBRAINZ_TRMID, "5678901"); ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_ARTIST_SORTNAME, "Five, 678901"); - gst_tag_list_free (list); + gst_tag_list_unref (list); } GST_END_TEST; @@ -342,45 +342,45 @@ GST_START_TEST (test_vorbis_tags) GST_LOG ("even_newer_list = %" GST_PTR_FORMAT, even_newer_list); fail_unless (gst_tag_list_is_equal (new_list, even_newer_list)); - gst_tag_list_free (new_list); - gst_tag_list_free (even_newer_list); + gst_tag_list_unref (new_list); + gst_tag_list_unref (even_newer_list); gst_buffer_unref (buf); gst_buffer_unref (buf2); } /* there can only be one language per taglist ... */ - gst_tag_list_free (list); + gst_tag_list_unref (list); list = gst_tag_list_new_empty (); gst_vorbis_tag_add (list, "LANGUAGE", "fr"); ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_LANGUAGE_CODE, "fr"); - gst_tag_list_free (list); + gst_tag_list_unref (list); list = gst_tag_list_new_empty (); gst_vorbis_tag_add (list, "LANGUAGE", "[fr]"); ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_LANGUAGE_CODE, "fr"); - gst_tag_list_free (list); + gst_tag_list_unref (list); list = gst_tag_list_new_empty (); gst_vorbis_tag_add (list, "LANGUAGE", "French [fr]"); ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_LANGUAGE_CODE, "fr"); - gst_tag_list_free (list); + gst_tag_list_unref (list); list = gst_tag_list_new_empty (); gst_vorbis_tag_add (list, "LANGUAGE", "[eng] English"); ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_LANGUAGE_CODE, "eng"); - gst_tag_list_free (list); + gst_tag_list_unref (list); list = gst_tag_list_new_empty (); gst_vorbis_tag_add (list, "LANGUAGE", "eng"); ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_LANGUAGE_CODE, "eng"); - gst_tag_list_free (list); + gst_tag_list_unref (list); list = gst_tag_list_new_empty (); gst_vorbis_tag_add (list, "LANGUAGE", "[eng]"); ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_LANGUAGE_CODE, "eng"); /* free-form *sigh* */ - gst_tag_list_free (list); + gst_tag_list_unref (list); list = gst_tag_list_new_empty (); gst_vorbis_tag_add (list, "LANGUAGE", "English"); ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_LANGUAGE_CODE, "English"); @@ -412,7 +412,7 @@ GST_START_TEST (test_vorbis_tags) gst_buffer_unref (buf2); } - gst_tag_list_free (list); + gst_tag_list_unref (list); /* make sure gst_tag_list_from_vorbiscomment_buffer() works with an * empty ID (for Speex) */ @@ -448,13 +448,13 @@ GST_START_TEST (test_vorbis_tags) fail_unless (list != NULL); fail_unless (gst_tag_list_n_tags (list) == 0); g_free (vendor); - gst_tag_list_free (list); + gst_tag_list_unref (list); /* now again without vendor */ list = gst_tag_list_from_vorbiscomment_buffer (buf, NULL, 0, NULL); fail_unless (list != NULL); fail_unless (gst_tag_list_n_tags (list) == 0); - gst_tag_list_free (list); + gst_tag_list_unref (list); gst_buffer_unref (buf); } @@ -496,7 +496,7 @@ GST_START_TEST (test_vorbis_tags) fail_unless (gst_tag_list_n_tags (list) == 1); ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_ARTIST, "foo bar"); g_free (vendor); - gst_tag_list_free (list); + gst_tag_list_unref (list); /* now again without vendor */ list = gst_tag_list_from_vorbiscomment_buffer (buf, @@ -504,7 +504,7 @@ GST_START_TEST (test_vorbis_tags) fail_unless (list != NULL); fail_unless (gst_tag_list_n_tags (list) == 1); ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_ARTIST, "foo bar"); - gst_tag_list_free (list); + gst_tag_list_unref (list); gst_buffer_unref (buf); } @@ -524,7 +524,7 @@ GST_START_TEST (test_vorbis_tags) fail_unless (gst_date_time_has_time (dt)); gst_date_time_unref (dt); - gst_tag_list_free (list); + gst_tag_list_unref (list); } /* check date with month/day of 00-00 */ @@ -542,7 +542,7 @@ GST_START_TEST (test_vorbis_tags) fail_unless (!gst_date_time_has_time (dt)); gst_date_time_unref (dt); - gst_tag_list_free (list); + gst_tag_list_unref (list); } /* check date with valid month, but day of 00 */ @@ -560,7 +560,7 @@ GST_START_TEST (test_vorbis_tags) fail_unless (!gst_date_time_has_time (dt)); gst_date_time_unref (dt); - gst_tag_list_free (list); + gst_tag_list_unref (list); } } @@ -679,7 +679,7 @@ GST_START_TEST (test_id3v1_utf8_tag) gst_date_time_unref (dt); dt = NULL; - gst_tag_list_free (tags); + gst_tag_list_unref (tags); g_unsetenv ("GST_ID3V1_TAG_ENCODING"); } @@ -979,7 +979,7 @@ GST_START_TEST (test_xmp_formatting) gst_buffer_unmap (buf, &map); gst_buffer_unref (buf); - gst_tag_list_free (list); + gst_tag_list_unref (list); } GST_END_TEST; @@ -1056,7 +1056,7 @@ GST_START_TEST (test_xmp_parsing) } } if (list) - gst_tag_list_free (list); + gst_tag_list_unref (list); gst_buffer_unref (buf); g_free (text); @@ -1081,7 +1081,7 @@ do_xmp_tag_serialization_deserialization (GstTagList * taglist, fail_unless (gst_tag_list_is_equal (taglist, taglist2)); gst_buffer_unref (buf); - gst_tag_list_free (taglist2); + gst_tag_list_unref (taglist2); } static void @@ -1093,7 +1093,7 @@ do_simple_xmp_tag_serialization_deserialization (const gchar * gsttag, gst_tag_list_add_value (taglist, GST_TAG_MERGE_REPLACE, gsttag, value); do_xmp_tag_serialization_deserialization (taglist, NULL); - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); } GST_START_TEST (test_xmp_tags_serialization_deserialization) @@ -1284,13 +1284,13 @@ GST_START_TEST (test_xmp_compound_tags) GST_TAG_KEYWORDS, "k2", GST_TAG_TITLE, "title", GST_TAG_KEYWORDS, "k3", NULL); do_xmp_tag_serialization_deserialization (taglist, NULL); - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); taglist = gst_tag_list_new_empty (); gst_tag_list_add (taglist, GST_TAG_MERGE_APPEND, GST_TAG_GEO_LOCATION_COUNTRY, "Brazil", GST_TAG_GEO_LOCATION_CITY, "Campina Grande", NULL); do_xmp_tag_serialization_deserialization (taglist, schemas); - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); } GST_END_TEST; @@ -1333,7 +1333,7 @@ GST_START_TEST (test_exif_parsing) gst_tag_list_peek_string_index (taglist, GST_TAG_COPYRIGHT, 0, &str); fail_unless_equals_string (str, "my copyright"); - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); gst_buffer_unref (buf); } @@ -1352,7 +1352,7 @@ do_exif_tag_serialization_deserialization (GstTagList * taglist) gst_buffer_unref (buf); fail_unless (gst_tag_list_is_equal (taglist, taglist2)); - gst_tag_list_free (taglist2); + gst_tag_list_unref (taglist2); /* BE */ buf = gst_tag_list_to_exif_buffer (taglist, G_BIG_ENDIAN, 0); @@ -1360,7 +1360,7 @@ do_exif_tag_serialization_deserialization (GstTagList * taglist) gst_buffer_unref (buf); fail_unless (gst_tag_list_is_equal (taglist, taglist2)); - gst_tag_list_free (taglist2); + gst_tag_list_unref (taglist2); /* APP1 */ buf = gst_tag_list_to_exif_buffer_with_tiff_header (taglist); @@ -1368,7 +1368,7 @@ do_exif_tag_serialization_deserialization (GstTagList * taglist) gst_buffer_unref (buf); fail_unless (gst_tag_list_is_equal (taglist, taglist2)); - gst_tag_list_free (taglist2); + gst_tag_list_unref (taglist2); } static void @@ -1380,7 +1380,7 @@ do_simple_exif_tag_serialization_deserialization (const gchar * gsttag, gst_tag_list_add_value (taglist, GST_TAG_MERGE_REPLACE, gsttag, value); do_exif_tag_serialization_deserialization (taglist); - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); } /* @@ -1411,7 +1411,7 @@ GST_START_TEST (test_exif_multiple_tags) do_exif_tag_serialization_deserialization (taglist); - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); } GST_END_TEST; @@ -1767,22 +1767,22 @@ GST_START_TEST (test_exif_tags_serialization_deserialization) taglist = gst_tag_list_new (GST_TAG_CAPTURING_FLASH_FIRED, FALSE, GST_TAG_CAPTURING_FLASH_MODE, "auto", NULL); do_exif_tag_serialization_deserialization (taglist); - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); taglist = gst_tag_list_new (GST_TAG_CAPTURING_FLASH_FIRED, TRUE, GST_TAG_CAPTURING_FLASH_MODE, "auto", NULL); do_exif_tag_serialization_deserialization (taglist); - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); taglist = gst_tag_list_new (GST_TAG_CAPTURING_FLASH_FIRED, FALSE, GST_TAG_CAPTURING_FLASH_MODE, "never", NULL); do_exif_tag_serialization_deserialization (taglist); - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); taglist = gst_tag_list_new (GST_TAG_CAPTURING_FLASH_FIRED, TRUE, GST_TAG_CAPTURING_FLASH_MODE, "always", NULL); do_exif_tag_serialization_deserialization (taglist); - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); } GST_END_TEST; diff --git a/tests/check/libs/xmpwriter.c b/tests/check/libs/xmpwriter.c index 402d08f..8d762dc 100644 --- a/tests/check/libs/xmpwriter.c +++ b/tests/check/libs/xmpwriter.c @@ -115,7 +115,7 @@ GST_START_TEST (test_no_xmp) (test_element), taglist, TRUE) == NULL); gst_object_unref (test_element); - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); } GST_END_TEST; @@ -138,7 +138,7 @@ GST_START_TEST (test_default) gst_object_unref (test_element); gst_buffer_unref (buf); gst_buffer_unref (buf2); - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); } GST_END_TEST; @@ -164,7 +164,7 @@ GST_START_TEST (test_disable) (test_element), taglist, TRUE); taglist2 = gst_tag_list_from_xmp_buffer (buf); fail_unless (gst_tag_list_is_equal (taglist, taglist2)); - gst_tag_list_free (taglist2); + gst_tag_list_unref (taglist2); gst_buffer_unref (buf); gst_tag_xmp_writer_remove_schema (GST_TAG_XMP_WRITER (test_element), "xap"); @@ -179,11 +179,11 @@ GST_START_TEST (test_disable) fail_unless (gst_tag_list_get_value_index (taglist2, GST_TAG_USER_RATING, 0) == NULL); - gst_tag_list_free (taglist2); + gst_tag_list_unref (taglist2); gst_buffer_unref (buf); gst_object_unref (test_element); - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); } GST_END_TEST; -- 2.7.4