summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a6cbe26)
raw | patch | inline | side by side (parent: a6cbe26)
author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | |
Sat, 31 Oct 2009 15:43:26 +0000 (16:43 +0100) | ||
committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | |
Sat, 31 Oct 2009 15:43:26 +0000 (16:43 +0100) |
This makes sure that it is always valid.
gst/parse/grammar.y | patch | blob | history |
diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
index 06345ce7760ca0072a5dc2bd79e04949a28f63d2..60115ecd4182ab5fcf08f5a9092599f6e51836a8 100644 (file)
--- a/gst/parse/grammar.y
+++ b/gst/parse/grammar.y
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
} 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;
}
}