parser: Always get DelayedLink information from the objects qdata

This makes sure that it is always valid.
This commit is contained in:
Sebastian Dröge 2009-10-31 16:43:26 +01:00
parent a6cbe26164
commit 5b5718cd20

View file

@ -434,12 +434,15 @@ gst_parse_free_delayed_link (DelayedLink *link)
static void
gst_parse_found_pad (GstElement *src, GstPad *pad, gpointer data)
{
DelayedLink *link = (DelayedLink *) data;
DelayedLink *link = g_object_get_qdata (G_OBJECT (src),
g_quark_from_static_string ("GstParseDelayedLink"));
GST_CAT_INFO (GST_CAT_PIPELINE, "trying delayed linking %s:%s to %s:%s",
GST_STR_NULL (GST_ELEMENT_NAME (src)), GST_STR_NULL (link->src_pad),
GST_STR_NULL (GST_ELEMENT_NAME (link->sink)), GST_STR_NULL (link->sink_pad));
g_return_if_fail (link != NULL);
if (gst_element_link_pads_filtered (src, link->src_pad, link->sink,
link->sink_pad, link->caps)) {
/* do this here, we don't want to get any problems later on when
@ -482,11 +485,11 @@ gst_parse_perform_delayed_link (GstElement *src, const gchar *src_pad,
} else {
data->caps = NULL;
}
data->signal_id = g_signal_connect (src, "pad-added",
G_CALLBACK (gst_parse_found_pad), data);
g_object_set_qdata_full (G_OBJECT (src),
g_quark_from_static_string ("GstParseDelayedLink"), data,
(GDestroyNotify)gst_parse_free_delayed_link);
data->signal_id = g_signal_connect (src, "pad-added",
G_CALLBACK (gst_parse_found_pad), NULL);
return TRUE;
}
}