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

grammar.y: fix childproxy code

Browse source 
It takes GObject and not GstObject now
This commit is contained in:
Wim Taymans 2012-03-31 12:00:56 +02:00
parent e7b9b68361
commit 3db0ce476f
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/parse/grammar.y
View file

@ -332,7 +332,7 @@ static void gst_parse_new_child(GstChildProxy *child_proxy, GObject *object,
DelayedSet *set = (DelayedSet *) data; DelayedSet *set = (DelayedSet *) data;
GParamSpec *pspec; GParamSpec *pspec;
GValue v = { 0, }; GValue v = { 0, };
GstObject *target = NULL; GObject *target = NULL;
GType value_type; GType value_type;
GST_CAT_LOG_OBJECT (GST_CAT_PIPELINE, child_proxy, "new child %s, checking property %s", GST_CAT_LOG_OBJECT (GST_CAT_PIPELINE, child_proxy, "new child %s, checking property %s",
@ -360,7 +360,7 @@ static void gst_parse_new_child(GstChildProxy *child_proxy, GObject *object,
g_signal_handler_disconnect (child_proxy, set->signal_id); g_signal_handler_disconnect (child_proxy, set->signal_id);
if (!got_value) if (!got_value)
goto error; goto error;
g_object_set_property (G_OBJECT (target), pspec->name, &v); g_object_set_property (target, pspec->name, &v);
} else { } else {
const gchar *obj_name = GST_OBJECT_NAME(object); const gchar *obj_name = GST_OBJECT_NAME(object);
gint len = strlen (obj_name); gint len = strlen (obj_name);
@ -375,12 +375,12 @@ out:
if (G_IS_VALUE (&v)) if (G_IS_VALUE (&v))
g_value_unset (&v); g_value_unset (&v);
if (target) if (target)
gst_object_unref (target); g_object_unref (target);
return; return;
error: error:
GST_CAT_ERROR (GST_CAT_PIPELINE, "could not set property \"%s\" in element \"%s\"", GST_CAT_ERROR (GST_CAT_PIPELINE, "could not set property \"%s\" in "
pspec->name, GST_ELEMENT_NAME (target)); GST_PTR_FORMAT, pspec->name, target);
goto out; goto out;
} }
@ -390,7 +390,7 @@ gst_parse_element_set (gchar *value, GstElement *element, graph_t *graph)
GParamSpec *pspec; GParamSpec *pspec;
gchar *pos = value; gchar *pos = value;
GValue v = { 0, }; GValue v = { 0, };
GstObject *target = NULL; GObject *target = NULL;
GType value_type; GType value_type;
/* do nothing if assignment is for missing element */ /* do nothing if assignment is for missing element */
@ -436,7 +436,7 @@ gst_parse_element_set (gchar *value, GstElement *element, graph_t *graph)
} }
if (!got_value) if (!got_value)
goto error; goto error;
g_object_set_property (G_OBJECT (target), pspec->name, &v); g_object_set_property (target, pspec->name, &v);
} else { } else {
/* do a delayed set */ /* do a delayed set */
if (GST_IS_CHILD_PROXY (element)) { if (GST_IS_CHILD_PROXY (element)) {
@ -454,7 +454,7 @@ out:
if (G_IS_VALUE (&v)) if (G_IS_VALUE (&v))
g_value_unset (&v); g_value_unset (&v);
if (target) if (target)
gst_object_unref (target); g_object_unref (target);
return; return;
error: error: