From 39ab4627e244c97d00ce42b68972f91bf094a57a Mon Sep 17 00:00:00 2001 From: Thijs Vermeir Date: Mon, 21 Jul 2008 21:32:06 +0000 Subject: [PATCH] gst/gstghostpad.c: Add in doc that gst_ghost_pad_set_target can accept Original commit message from CVS: * gst/gstghostpad.c: Add in doc that gst_ghost_pad_set_target can accept NULL to clear target --- ChangeLog | 6 ++++++ common | 2 +- gst/gstghostpad.c | 8 ++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22be7df6c5..9becebd268 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-21 Thijs Vermeir + + * gst/gstghostpad.c: + Add in doc that gst_ghost_pad_set_target can accept + NULL to clear target + 2008-07-15 Michael Smith * gst/gstplugin.c: diff --git a/common b/common index a100efef18..e79879859b 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit a100efef186a5f8999fe3aa42c0720f5123c08eb +Subproject commit e79879859bc866545379eb77e1378a906dc30ebf diff --git a/gst/gstghostpad.c b/gst/gstghostpad.c index 6996491c4b..2aba5d2fcf 100644 --- a/gst/gstghostpad.c +++ b/gst/gstghostpad.c @@ -1025,7 +1025,8 @@ gst_ghost_pad_get_target (GstGhostPad * gpad) * @newtarget: the new pad target * * Set the new target of the ghostpad @gpad. Any existing target - * is unlinked and links to the new target are established. + * is unlinked and links to the new target are established. if @newtarget is + * NULL the target will be cleared. * * Returns: TRUE if the new target could be set. This function can return FALSE * when the internal pads could not be linked. @@ -1043,7 +1044,10 @@ gst_ghost_pad_set_target (GstGhostPad * gpad, GstPad * newtarget) GST_PROXY_LOCK (gpad); internal = GST_PROXY_PAD_INTERNAL (gpad); - GST_DEBUG_OBJECT (gpad, "set target %s:%s", GST_DEBUG_PAD_NAME (newtarget)); + if (newtarget) + GST_DEBUG_OBJECT (gpad, "set target %s:%s", GST_DEBUG_PAD_NAME (newtarget)); + else + GST_DEBUG_OBJECT (gpad, "clearing target"); /* clear old target */ if ((oldtarget = GST_PROXY_PAD_TARGET (gpad))) {