Update for gst_tag_setter API changes.
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:
parent
d731d22791
commit
2d4d7ebcb7
@ -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>
|
2005-11-22 Andy Wingo <wingo@pobox.com>
|
||||||
|
|
||||||
* ext/a52dec/gsta52dec.c (gst_a52dec_sink_event)
|
* ext/a52dec/gsta52dec.c (gst_a52dec_sink_event)
|
||||||
|
@ -636,12 +636,12 @@ gst_lame_set_metadata (GstLame * lame)
|
|||||||
|
|
||||||
g_return_if_fail (lame != NULL);
|
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)) {
|
if ((lame->tags == NULL) && (user_tags == NULL)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
copy = gst_tag_list_merge (user_tags, lame->tags,
|
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_foreach ((GstTagList *) copy, add_one_tag, lame);
|
||||||
|
|
||||||
gst_tag_list_free (copy);
|
gst_tag_list_free (copy);
|
||||||
@ -927,7 +927,7 @@ gst_lame_sink_event (GstPad * pad, GstEvent * event)
|
|||||||
|
|
||||||
gst_event_parse_tag (event, &taglist),
|
gst_event_parse_tag (event, &taglist),
|
||||||
gst_tag_list_insert (lame->tags, 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 {
|
} else {
|
||||||
g_assert_not_reached ();
|
g_assert_not_reached ();
|
||||||
}
|
}
|
||||||
|
@ -823,11 +823,13 @@ gst_id3_tag_get_tag_to_render (GstID3Tag * tag)
|
|||||||
} else if (tag->parsed_tags) {
|
} else if (tag->parsed_tags) {
|
||||||
ret = gst_tag_list_copy (tag->parsed_tags);
|
ret = gst_tag_list_copy (tag->parsed_tags);
|
||||||
}
|
}
|
||||||
if (ret && 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_list (GST_TAG_SETTER (tag)),
|
gst_tag_list_insert (ret,
|
||||||
gst_tag_setter_get_merge_mode (GST_TAG_SETTER (tag)));
|
gst_tag_setter_get_tag_list (GST_TAG_SETTER (tag)),
|
||||||
} else if (gst_tag_setter_get_list (GST_TAG_SETTER (tag))) {
|
gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (tag)));
|
||||||
ret = gst_tag_list_copy (gst_tag_setter_get_list (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;
|
return ret;
|
||||||
}
|
}
|
||||||
@ -1314,7 +1316,7 @@ gst_id3_tag_chain (GstPad * pad, GstBuffer * buffer)
|
|||||||
tag->v1tag_size_new = (tag->v1tag_render &&
|
tag->v1tag_size_new = (tag->v1tag_render &&
|
||||||
IS_MUXER (tag) &&
|
IS_MUXER (tag) &&
|
||||||
(tag->parsed_tags != NULL ||
|
(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;
|
NULL)) ? 128 : 0;
|
||||||
/* fall through */
|
/* fall through */
|
||||||
case GST_ID3_TAG_STATE_NORMAL:
|
case GST_ID3_TAG_STATE_NORMAL:
|
||||||
|
@ -437,7 +437,7 @@ start_play_tune (GstSidDec * siddec)
|
|||||||
goto could_not_init;
|
goto could_not_init;
|
||||||
|
|
||||||
gst_pad_push_event (siddec->srcpad,
|
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,
|
res = gst_pad_start_task (siddec->srcpad,
|
||||||
(GstTaskFunction) play_loop, siddec->srcpad);
|
(GstTaskFunction) play_loop, siddec->srcpad);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user