[gst-cvs] gnonlin: gnlcomposition: clear private-> ghosteventprobe when the pad goes away.

[Alessandro Decina]

Module: gnonlin
Branch: master
Commit: 583a6642c9eda1ba5e071e5fd599c52acd4301d9
URL:    http://cgit.freedesktop.org/gstreamer/gnonlin/commit/?id=583a6642c9eda1ba5e071e5fd599c52acd4301d9

Author: Alessandro Decina <alessandro.decina at collabora.co.uk>
Date:   Tue Mar 24 17:31:21 2009 +0100

gnlcomposition: clear private->ghosteventprobe when the pad goes away.

---

 gnl/gnlcomposition.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/gnl/gnlcomposition.c b/gnl/gnlcomposition.c
index c27371a..4eb40e3 100644
--- a/gnl/gnlcomposition.c
+++ b/gnl/gnlcomposition.c
@@ -303,6 +303,7 @@ gnl_composition_dispose (GObject * object)
   if (comp->private->ghostpad) {
     gnl_object_remove_ghost_pad ((GnlObject *) object, comp->private->ghostpad);
     comp->private->ghostpad = NULL;
+    comp->private->ghosteventprobe = 0;
   }
 
   if (comp->private->childseek) {
@@ -443,6 +444,7 @@ gnl_composition_reset (GnlComposition * comp)
   if (comp->private->ghostpad) {
     gnl_object_remove_ghost_pad ((GnlObject *) comp, comp->private->ghostpad);
     comp->private->ghostpad = NULL;
+    comp->private->ghosteventprobe = 0;
   }
 
   if (comp->private->childseek) {
@@ -531,6 +533,8 @@ ghost_event_probe_handler (GstPad * ghostpad, GstEvent * event,
       }
       COMP_FLUSHING_UNLOCK (comp);
 
+      GST_ERROR_OBJECT (comp, "MEH");
+
       GST_DEBUG_OBJECT (comp, "Adding eos handling to main thread");
       if (comp->private->pending_idle) {
         GST_WARNING_OBJECT (comp,
@@ -909,10 +913,11 @@ gnl_composition_ghost_pad_set_target (GnlComposition * comp, GstPad * target)
       comp->private->ghostpad, target);
 
   if (target && (comp->private->ghosteventprobe == 0)) {
-    GST_DEBUG ("Setting event probe");
     comp->private->ghosteventprobe =
         gst_pad_add_event_probe (target, G_CALLBACK (ghost_event_probe_handler),
         comp);
+    GST_DEBUG_OBJECT (comp, "added event probe %d",
+        comp->private->ghosteventprobe);
   }
 
   if (!(hadghost)) {
@@ -2063,6 +2068,7 @@ update_pipeline (GnlComposition * comp, GstClockTime currenttime,
         gnl_object_remove_ghost_pad ((GnlObject *) comp,
             comp->private->ghostpad);
         comp->private->ghostpad = NULL;
+        comp->private->ghosteventprobe = 0;
         comp->private->segment_start = 0;
         comp->private->segment_stop = GST_CLOCK_TIME_NONE;
       }
@@ -2176,6 +2182,7 @@ object_pad_removed (GnlObject * object, GstPad * pad, GnlComposition * comp)
     GST_DEBUG_OBJECT (comp, "Removing ghostpad");
     gnl_object_remove_ghost_pad ((GnlObject *) comp, comp->private->ghostpad);
     comp->private->ghostpad = NULL;
+    comp->private->ghosteventprobe = 0;
   } else {
     /* unblock it ! */
     gst_pad_set_blocked_async (pad, FALSE, (GstPadBlockCallback) pad_blocked,