[gst-cvs] gst-plugins-bad: rtpbin: remove ptdemux ghostpads

[Wim Taymans]

Module: gst-plugins-bad
Branch: master
Commit: 269f3ff1a270e1c3cd9b6204c7171d47eb7dfbf1
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=269f3ff1a270e1c3cd9b6204c7171d47eb7dfbf1

Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date:   Mon May 25 13:46:29 2009 +0200

rtpbin: remove ptdemux ghostpads

---

 gst/rtpmanager/gstrtpbin.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/gst/rtpmanager/gstrtpbin.c b/gst/rtpmanager/gstrtpbin.c
index 017ffc0..19de4f1 100644
--- a/gst/rtpmanager/gstrtpbin.c
+++ b/gst/rtpmanager/gstrtpbin.c
@@ -306,6 +306,8 @@ struct _GstRtpBinStream
   gulong demux_newpad_sig;
   gulong demux_ptreq_sig;
   gulong demux_pt_change_sig;
+  /* ghostpads from the ptdemuxer */
+  GSList *pads;
 
   /* if we have calculated a valid unix_delta for this stream */
   gboolean have_sync;
@@ -1169,6 +1171,7 @@ static void
 free_stream (GstRtpBinStream * stream)
 {
   GstRtpBinSession *session;
+  GSList *walk;
 
   session = stream->session;
 
@@ -1184,6 +1187,14 @@ free_stream (GstRtpBinStream * stream)
   gst_bin_remove (GST_BIN_CAST (session->bin), stream->buffer);
   gst_bin_remove (GST_BIN_CAST (session->bin), stream->demux);
 
+  for (walk = stream->pads; walk; walk = g_slist_next (walk)) {
+    GstPad *gpad = GST_PAD_CAST (walk->data);
+
+    gst_pad_set_active (gpad, FALSE);
+    gst_element_remove_pad (GST_ELEMENT_CAST (session->bin), gpad);
+  }
+  g_slist_free (stream->pads);
+
   g_free (stream);
 }
 
@@ -1880,6 +1891,8 @@ new_payload_found (GstElement * element, guint pt, GstPad * pad,
   gst_pad_set_active (gpad, TRUE);
   gst_element_add_pad (GST_ELEMENT_CAST (rtpbin), gpad);
 
+  stream->pads = g_slist_prepend (stream->pads, gpad);
+
   GST_RTP_BIN_SHUTDOWN_UNLOCK (rtpbin);
 
   return;