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

Update for gst_tag_setter API changes.

Browse source 
Original commit message from CVS:
2005-11-22  Andy Wingo  <wingo@pobox.com>

* Update for gst_tag_setter API changes.
This commit is contained in:
Andy Wingo 2005-11-22 12:39:29 +00:00
parent d731d22791
commit 2d4d7ebcb7
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2005-11-22 Andy Wingo <wingo@pobox.com>
* Update for gst_tag_setter API changes.
2005-11-22 Andy Wingo <wingo@pobox.com>
* ext/a52dec/gsta52dec.c (gst_a52dec_sink_event)

6
ext/lame/gstlame.c
View file

@ -636,12 +636,12 @@ gst_lame_set_metadata (GstLame * lame)
g_return_if_fail (lame != NULL);
user_tags = gst_tag_setter_get_list (GST_TAG_SETTER (lame));
user_tags = gst_tag_setter_get_tag_list (GST_TAG_SETTER (lame));
if ((lame->tags == NULL) && (user_tags == NULL)) {
return;
}
copy = gst_tag_list_merge (user_tags, lame->tags,
gst_tag_setter_get_merge_mode (GST_TAG_SETTER (lame)));
gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (lame)));
gst_tag_list_foreach ((GstTagList *) copy, add_one_tag, lame);
gst_tag_list_free (copy);
@ -927,7 +927,7 @@ gst_lame_sink_event (GstPad * pad, GstEvent * event)
gst_event_parse_tag (event, &taglist),
gst_tag_list_insert (lame->tags, taglist,
gst_tag_setter_get_merge_mode (GST_TAG_SETTER (lame)));
gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (lame)));
} else {
g_assert_not_reached ();
}

14
ext/mad/gstid3tag.c
View file

@ -823,11 +823,13 @@ gst_id3_tag_get_tag_to_render (GstID3Tag * tag)
} else if (tag->parsed_tags) {
ret = gst_tag_list_copy (tag->parsed_tags);
}
if (ret && gst_tag_setter_get_list (GST_TAG_SETTER (tag))) {
gst_tag_list_insert (ret, gst_tag_setter_get_list (GST_TAG_SETTER (tag)),
gst_tag_setter_get_merge_mode (GST_TAG_SETTER (tag)));
} else if (gst_tag_setter_get_list (GST_TAG_SETTER (tag))) {
ret = gst_tag_list_copy (gst_tag_setter_get_list (GST_TAG_SETTER (tag)));
if (ret && gst_tag_setter_get_tag_list (GST_TAG_SETTER (tag))) {
gst_tag_list_insert (ret,
gst_tag_setter_get_tag_list (GST_TAG_SETTER (tag)),
gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (tag)));
} else if (gst_tag_setter_get_tag_list (GST_TAG_SETTER (tag))) {
ret =
gst_tag_list_copy (gst_tag_setter_get_tag_list (GST_TAG_SETTER (tag)));
}
return ret;
}
@ -1314,7 +1316,7 @@ gst_id3_tag_chain (GstPad * pad, GstBuffer * buffer)
tag->v1tag_size_new = (tag->v1tag_render &&
IS_MUXER (tag) &&
(tag->parsed_tags != NULL ||
gst_tag_setter_get_list (GST_TAG_SETTER (tag)) !=
gst_tag_setter_get_tag_list (GST_TAG_SETTER (tag)) !=
NULL)) ? 128 : 0;
/* fall through */
case GST_ID3_TAG_STATE_NORMAL:

2
ext/sidplay/gstsiddec.cc
View file

@ -437,7 +437,7 @@ start_play_tune (GstSidDec * siddec)
goto could_not_init;
gst_pad_push_event (siddec->srcpad,
gst_event_new_newsegment (FALSE, 1.0, GST_FORMAT_TIME, 0, -1, 0));
gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, 0, -1, 0));
res = gst_pad_start_task (siddec->srcpad,
(GstTaskFunction) play_loop, siddec->srcpad);